From patchwork Sun Jul 6 16:14:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: HIMANGI SARAOGI X-Patchwork-Id: 4490031 Return-Path: X-Original-To: patchwork-linux-spi@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 F1A7CBEEAA for ; Sun, 6 Jul 2014 16:14:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1FA90202C8 for ; Sun, 6 Jul 2014 16:14:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 577FA20254 for ; Sun, 6 Jul 2014 16:14:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751864AbaGFQO6 (ORCPT ); Sun, 6 Jul 2014 12:14:58 -0400 Received: from mail-pd0-f173.google.com ([209.85.192.173]:52335 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751492AbaGFQO5 (ORCPT ); Sun, 6 Jul 2014 12:14:57 -0400 Received: by mail-pd0-f173.google.com with SMTP id r10so4054749pdi.4 for ; Sun, 06 Jul 2014 09:14:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=bgzrUsoyCRrZ5hlL8S5tc30rYA7rKSq1FO9L/jjbaS8=; b=UiRkyKJm8Fo/4ekZIioSLkMBFLlan8y/N51K/6Fy9kHJihiFzfRCctBUr7pm5MZOY/ TeY1J+WoznOxyIImj8QIj6v3DpVk5mY+j2rVr12KHieZDfDe2xO+w9woCkX//nXozV8h 0HGFpObTWBMXXGqwtNEHXo7eWiRhxoK9lYbUjjHo1YLOEuBjFKevRarqBpnU+XZ9/CrV YB5WRO86xmguuua0TkIzaIK+zaQkprnw6pQGuCuZnpmmwxneLgeVLhFnAGRsngiSYI4a VSTOF/Q6pKqwn4N46sVh5dbSYebcC8XOAYkuSCMVYxfHBinmjFYIyFEGR1SR0PStBeOh fW/w== X-Received: by 10.66.141.71 with SMTP id rm7mr804088pab.120.1404663296857; Sun, 06 Jul 2014 09:14:56 -0700 (PDT) Received: from localhost ([122.178.76.19]) by mx.google.com with ESMTPSA id da10sm2248884pdb.60.2014.07.06.09.14.53 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 06 Jul 2014 09:14:55 -0700 (PDT) Date: Sun, 6 Jul 2014 21:44:50 +0530 From: Himangi Saraogi To: Mark Brown , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: julia.lawall@lip6.fr Subject: [PATCH] spi/spi-sh: Use devm_ioremap Message-ID: <20140706161450.GA6304@himangi-Dell> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 This patch introduces the use of devm_ioremap and removes the iounmaps in the probe and remove functions. Also, the labels are renamed to preserve ordering. Signed-off-by: Himangi Saraogi Acked-by: Julia Lawall --- drivers/spi/spi-sh.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/spi/spi-sh.c b/drivers/spi/spi-sh.c index 03edf5e..8e171a7 100644 --- a/drivers/spi/spi-sh.c +++ b/drivers/spi/spi-sh.c @@ -432,7 +432,6 @@ static int spi_sh_remove(struct platform_device *pdev) spi_unregister_master(ss->master); destroy_workqueue(ss->workqueue); free_irq(ss->irq, ss); - iounmap(ss->addr); return 0; } @@ -480,7 +479,7 @@ static int spi_sh_probe(struct platform_device *pdev) } ss->irq = irq; ss->master = master; - ss->addr = ioremap(res->start, resource_size(res)); + ss->addr = devm_ioremap(&pdev->dev, res->start, resource_size(res)); if (ss->addr == NULL) { dev_err(&pdev->dev, "ioremap error.\n"); ret = -ENOMEM; @@ -495,13 +494,13 @@ static int spi_sh_probe(struct platform_device *pdev) if (ss->workqueue == NULL) { dev_err(&pdev->dev, "create workqueue error\n"); ret = -EBUSY; - goto error2; + goto error1; } ret = request_irq(irq, spi_sh_irq, 0, "spi_sh", ss); if (ret < 0) { dev_err(&pdev->dev, "request_irq error\n"); - goto error3; + goto error2; } master->num_chipselect = 2; @@ -513,17 +512,15 @@ static int spi_sh_probe(struct platform_device *pdev) ret = spi_register_master(master); if (ret < 0) { printk(KERN_ERR "spi_register_master error.\n"); - goto error4; + goto error3; } return 0; - error4: - free_irq(irq, ss); error3: - destroy_workqueue(ss->workqueue); + free_irq(irq, ss); error2: - iounmap(ss->addr); + destroy_workqueue(ss->workqueue); error1: spi_master_put(master);