[PATCH 1/5] staging: comedi: drivers: rename 'comedi_dev' in comedi_auto_config()

H Hartley Sweeten hsweeten at visionengravers.com
Mon Apr 8 17:55:05 UTC 2013


The struct comedi_device pointer in this file, and the rest of the
comedi subsystem, is typically called 'dev'. Rename the local variable
'comedi_dev' in comedi_auto_config() for consistency.

Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 drivers/staging/comedi/drivers.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index 81705fb..8db9dee 100644
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -397,7 +397,7 @@ int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 int comedi_auto_config(struct device *hardware_device,
 		       struct comedi_driver *driver, unsigned long context)
 {
-	struct comedi_device *comedi_dev;
+	struct comedi_device *dev;
 	int ret;
 
 	if (!hardware_device) {
@@ -417,18 +417,18 @@ int comedi_auto_config(struct device *hardware_device,
 		return -EINVAL;
 	}
 
-	comedi_dev = comedi_alloc_board_minor(hardware_device);
-	if (IS_ERR(comedi_dev))
-		return PTR_ERR(comedi_dev);
-	/* Note: comedi_alloc_board_minor() locked comedi_dev->mutex. */
+	dev = comedi_alloc_board_minor(hardware_device);
+	if (IS_ERR(dev))
+		return PTR_ERR(dev);
+	/* Note: comedi_alloc_board_minor() locked dev->mutex. */
 
-	comedi_dev->driver = driver;
-	ret = driver->auto_attach(comedi_dev, context);
+	dev->driver = driver;
+	ret = driver->auto_attach(dev, context);
 	if (ret >= 0)
-		ret = comedi_device_postconfig(comedi_dev);
+		ret = comedi_device_postconfig(dev);
 	if (ret < 0)
-		comedi_device_detach(comedi_dev);
-	mutex_unlock(&comedi_dev->mutex);
+		comedi_device_detach(dev);
+	mutex_unlock(&dev->mutex);
 
 	if (ret < 0)
 		comedi_release_hardware_device(hardware_device);
-- 
1.8.1.4




More information about the devel mailing list