[PATCH] spi: bcm53xx: Adjust devm usage

Path	csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Vaishali Thakkar <vthakkar1994@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH] spi: bcm53xx: Adjust devm usage
Date	Thu, 20 Aug 2015 20:00:02 +0200
Message-ID	<pZCi6-3Fh-9@gated-at.bofh.it> (permalink)
X-Original-To	Mark Brown <broonie@kernel.org>
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=WXYAUyXfN9wlJzYM+bYyHDyjDJI//q+j64GZtpGtp60=; b=oalQxkGIbXLTDhfFNLr/pGDwlkuRS/Plmf8Ftdyrg4DAGAmNKPAtnuYNgxR9pf++3A 4c2MssKAB3XL0eJH9japzROv817JwJIcAEl6DXMLeXEKzROkYnhhYTYXL4P/cwVqYuJQ 6+l7JdOkB+qju6GOWAzsuJHKQHJMDdhFh0b/E2Fs91JGgrq5gtFBjj6B3gAFMMswhR43 Gj94qBNspYr2F+2DF/gOhpKcV5dtium+f5H2Kk2NcRsTVxSpOZYnjj2SwFXInEj1wBoP Siz2eY15eyMhdkfILM3QE2NLPs7ijeQW9r0BIzhHEf40Imirpcja0jjd/LV1kz5X/cwC A3JQ==
X-Received	by 10.68.201.105 with SMTP id jz9mr8733846pbc.86.1440093524948; Thu, 20 Aug 2015 10:58:44 -0700 (PDT)
MIME-Version	1.0
Content-Type	text/plain; charset=us-ascii
Content-Disposition	inline
User-Agent	Mutt/1.5.21 (2010-09-15)
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	55
Organization	linux.* mail to news gateway
X-Original-Cc	linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org
X-Original-Date	Thu, 20 Aug 2015 23:28:38 +0530
X-Original-Message-ID	<20150820175838.GA4895@localhost>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1210656

Show key headers only | View raw

Remove use of spi_unregister_master in remove function as
devm_spi_register_master in probe function automatically
handles it. To be compatible with the change, use direct
return instead of goto and remove unnedded label out.

Also, remove bcm53xxspi_bcma_remove as it is now redundant.

Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com>
---
 drivers/spi/spi-bcm53xx.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/drivers/spi/spi-bcm53xx.c b/drivers/spi/spi-bcm53xx.c
index 1520554..cc3f938 100644
--- a/drivers/spi/spi-bcm53xx.c
+++ b/drivers/spi/spi-bcm53xx.c
@@ -247,28 +247,19 @@ static int bcm53xxspi_bcma_probe(struct bcma_device *core)
 	if (err) {
 		spi_master_put(master);
 		bcma_set_drvdata(core, NULL);
-		goto out;
+		return err;
 	}
 
 	/* Broadcom SoCs (at least with the CC rev 42) use SPI for flash only */
 	spi_new_device(master, &bcm53xx_info);
 
-out:
-	return err;
-}
-
-static void bcm53xxspi_bcma_remove(struct bcma_device *core)
-{
-	struct bcm53xxspi *b53spi = bcma_get_drvdata(core);
-
-	spi_unregister_master(b53spi->master);
+	return 0;
 }
 
 static struct bcma_driver bcm53xxspi_bcma_driver = {
 	.name		= KBUILD_MODNAME,
 	.id_table	= bcm53xxspi_bcma_tbl,
 	.probe		= bcm53xxspi_bcma_probe,
-	.remove		= bcm53xxspi_bcma_remove,
 };
 
 /**************************************************
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] spi: bcm53xx: Adjust devm usage Vaishali Thakkar <vthakkar1994@gmail.com> - 2015-08-20 20:00 +0200

csiph-web