From patchwork Wed Apr 30 16:59:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Molton X-Patchwork-Id: 4095131 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EF6A2BFF02 for ; Wed, 30 Apr 2014 16:59:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 315B9202BE for ; Wed, 30 Apr 2014 16:59:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 66404202AE for ; Wed, 30 Apr 2014 16:59:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964880AbaD3Q7g (ORCPT ); Wed, 30 Apr 2014 12:59:36 -0400 Received: from ducie-dc1.codethink.co.uk ([185.25.241.215]:47927 "EHLO ducie-dc1.codethink.co.uk" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S964792AbaD3Q7g (ORCPT ); Wed, 30 Apr 2014 12:59:36 -0400 Received: from localhost (localhost [127.0.0.1]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTP id AFB074674A6; Wed, 30 Apr 2014 17:59:35 +0100 (BST) X-Virus-Scanned: Debian amavisd-new at ducie-dc1.codethink.co.uk Received: from ducie-dc1.codethink.co.uk ([127.0.0.1]) by localhost (ducie-dc1.codethink.co.uk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1ydStnx7vdQG; Wed, 30 Apr 2014 17:59:30 +0100 (BST) Received: from snark.dyn.ducie.codethink.co.uk (snark.dyn.ducie.codethink.co.uk [10.24.1.101]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTPS id CFF8346645D; Wed, 30 Apr 2014 17:59:19 +0100 (BST) Received: from ian by snark.dyn.ducie.codethink.co.uk with local (Exim 4.82) (envelope-from ) id 1WfXql-0001pA-BQ; Wed, 30 Apr 2014 17:59:15 +0100 From: Ian Molton To: linux-mmc@vger.kernel.org Cc: grant.likely@linaro.org, chris@printf.net, Ian Molton Subject: [PATCH 3/6] mmc: TMIO: Use devm_ioremap() Date: Wed, 30 Apr 2014 17:59:08 +0100 Message-Id: <1398877151-6965-4-git-send-email-ian.molton@codethink.co.uk> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1398877151-6965-1-git-send-email-ian.molton@codethink.co.uk> References: <1398877151-6965-1-git-send-email-ian.molton@codethink.co.uk> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use devm_ioremap for tmio / sh_mobile. Reviewed-by: Violeta Menendez Signed-off-by: Ian Molton --- drivers/mmc/host/tmio_mmc_pio.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index 7db9310..50e8c01 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c @@ -1021,7 +1021,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *host) if (ret < 0) goto host_free; - host->ctl = ioremap(res_ctl->start, resource_size(res_ctl)); + host->ctl = devm_ioremap(dev, res_ctl->start, resource_size(res_ctl)); if (!host->ctl) { ret = -ENOMEM; goto host_free; @@ -1119,7 +1119,6 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *host) pm_disable: pm_runtime_disable(dev); - iounmap(host->ctl); host_free: mmc_free_host(mmc); @@ -1145,7 +1144,6 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host) pm_runtime_put_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); - iounmap(host->ctl); mmc_free_host(mmc); } EXPORT_SYMBOL(tmio_mmc_host_remove);