diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-04-08 10:55:05 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-08 11:39:19 -0700 |
| commit | 6013a9a57bbe0fd147482297b04d3d848aa24b67 (patch) | |
| tree | d4ce4af0f65b67ebbac7436ebca3ce762745878f | |
| parent | 262235b13c22f6b7f84173f350964e71a849067d (diff) | |
staging: comedi: drivers: rename 'comedi_dev' in comedi_auto_config()
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@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c index 81705fbfc018..8db9deed3bc6 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); |