[PATCH] iio: stx104: Utilize devm_ functions in driver probe callback

Path	csiph.com!news.mixmin.net!aioe.org!news.servidellagleba.it!bofh.it!news.nic.it!robomod
From	William Breathitt Gray <vilhelm.gray@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH] iio: stx104: Utilize devm_ functions in driver probe callback
Date	Tue, 24 Jan 2017 21:30:02 +0100
Message-ID	<t3fT4-sV-29@gated-at.bofh.it> (permalink)
X-Original-To	jic23@kernel.org, knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=opIKHnrdcWwdWw2lO5d+r8/0/nI8wnKHn9aLpImugFM=; b=Gim8V1XIL9FcI1oWCMnl2bzKGdbuSS9Qb1RSHDHk3/b7ZUcTOmAHoxMFvjtPCODpQr E751k9eaSb6I/WUMnDi1ldbmok9n9IB3L/RcnMDGGWDLazzNAhqx7V+g4CAIQjDbWjDS r2dzZslzaQZYCnobvooliI9RWmxzyS0oEihDM1i5SJCgY3BW2WKQiNUwXwmbz7zEbZV5 cVIgBtAxsHF5KbtLUFQqkkQaKT42XytnXwX0bR9L7lZHX5JS9Un0Q8vipbzpJZQnTwnN XGrXIKD9/bV146I2s4p1T0+A0Ggo23Oh+7Xg8nQIUt1UFb4MaHtoUlx4vW3g0pBOHsub pU+Q==
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=opIKHnrdcWwdWw2lO5d+r8/0/nI8wnKHn9aLpImugFM=; b=kKNAowNkYlgJnm1dJFCPm0aG90VTinNe/yN6Sq/xPugJd1z6Wei79m2DKspUJ7C+uW kK/TyeI76m0Cgt9G51yymchmoUZuGDst5W/Z31M9TWfq5AebdguEl1zCD8rltisSGIr9 Vh7oVLntOHUSfEQBZffalT8Yd8LIqf3QbcPnYUcCiZzzbjDK54lsCkJCfAqbLTwDgd+H MTyFY21qaHEFh7HiHD99dKNJ4R1BH0YRzqeZiid+4Z3dMDsYhRw6aeEjbawZNnMHXJkg 20xPZrzGP/VsMWEQgUNRXgOuJbdu+aEJAuY1/oO6NZMK11pishLfrku0Wyw7tIHsa6k5 VpAw==
X-Gm-Message-State	AIkVDXKhpVdZrbK5jX5cLolLrmZEzoCoPy1GTC1oCQ8t5zn1tcuUSWMPlmXj5CC9jlyoZQ==
X-Received	by 10.129.132.82 with SMTP id u79mr29000445ywf.299.1485289609141; Tue, 24 Jan 2017 12:26:49 -0800 (PST)
X-Mailer	git-send-email 2.11.0
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	60
Organization	linux.* mail to news gateway
X-Original-Cc	linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, William Breathitt Gray <vilhelm.gray@gmail.com>
X-Original-Date	Tue, 24 Jan 2017 15:26:17 -0500
X-Original-Message-ID	<20170124202617.15512-1-vilhelm.gray@gmail.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1566127

Show key headers only | View raw

The devm_ resource manager functions allow memory to be automatically
released when a device is unbound. This patch takes advantage of the
resource manager functions and replaces the gpiochip_add_data call and
iio_device_register call with the devm_gpiochip_add_data call and
devm_iio_device_register call respectively. In addition, the
stx104_remove function has been removed as no longer necessary due to
the use of the relevant devm_ resource manager functions.

Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
---
 drivers/iio/adc/stx104.c | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/drivers/iio/adc/stx104.c b/drivers/iio/adc/stx104.c
index 7e3645749eaf..c56ff286695d 100644
--- a/drivers/iio/adc/stx104.c
+++ b/drivers/iio/adc/stx104.c
@@ -339,30 +339,13 @@ static int stx104_probe(struct device *dev, unsigned int id)
 	stx104dev->chip = &stx104gpio->chip;
 	dev_set_drvdata(dev, stx104dev);
 
-	err = gpiochip_add_data(&stx104gpio->chip, stx104gpio);
+	err = devm_gpiochip_add_data(dev, &stx104gpio->chip, stx104gpio);
 	if (err) {
 		dev_err(dev, "GPIO registering failed (%d)\n", err);
 		return err;
 	}
 
-	err = iio_device_register(indio_dev);
-	if (err) {
-		dev_err(dev, "IIO device registering failed (%d)\n", err);
-		gpiochip_remove(&stx104gpio->chip);
-		return err;
-	}
-
-	return 0;
-}
-
-static int stx104_remove(struct device *dev, unsigned int id)
-{
-	struct stx104_dev *const stx104dev = dev_get_drvdata(dev);
-
-	iio_device_unregister(stx104dev->indio_dev);
-	gpiochip_remove(stx104dev->chip);
-
-	return 0;
+	return devm_iio_device_register(dev, indio_dev);
 }
 
 static struct isa_driver stx104_driver = {
@@ -370,7 +353,6 @@ static struct isa_driver stx104_driver = {
 	.driver = {
 		.name = "stx104"
 	},
-	.remove = stx104_remove
 };
 
 module_isa_driver(stx104_driver, num_stx104);
-- 
2.11.0

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

Thread

[PATCH] iio: stx104: Utilize devm_ functions in driver probe callback William Breathitt Gray <vilhelm.gray@gmail.com> - 2017-01-24 21:30 +0100
  Re: [PATCH] iio: stx104: Utilize devm_ functions in driver probe  callback Jonathan Cameron <jic23@kernel.org> - 2017-01-28 13:50 +0100

csiph-web