leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: drivers: set dev->board_name before attaching

Browse Source 
The comedi (*attach) and (*auto_attach) functions are used to attach
legacy and PnP type devices to the comedi subsystem. If we can set the
dev->board_name before doing the attach, the drivers will not have to
worry about doing it.

Drivers that do additional probing can still change the dev->board_name
if necessary.

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>
This commit is contained in:
H Hartley Sweeten 2013-04-08 10:55:29 -07:00 committed by Greg Kroah-Hartman
parent 6013a9a57b
commit 34b68400ee
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/comedi/drivers.c
View File

@ -383,6 +383,8 @@ int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* initialize dev->driver here so /* initialize dev->driver here so
* comedi_error() can be called from attach */ * comedi_error() can be called from attach */
dev->driver = driv; dev->driver = driv;
dev->board_name = dev->board_ptr ? *(const char **)dev->board_ptr
: dev->driver->driver_name;
ret = driv->attach(dev, it); ret = driv->attach(dev, it);
if (ret >= 0) if (ret >= 0)
ret = comedi_device_postconfig(dev); ret = comedi_device_postconfig(dev);
@ -423,6 +425,7 @@ int comedi_auto_config(struct device *hardware_device,
/* Note: comedi_alloc_board_minor() locked dev->mutex. */ /* Note: comedi_alloc_board_minor() locked dev->mutex. */
dev->driver = driver; dev->driver = driver;
dev->board_name = dev->driver->driver_name;
ret = driver->auto_attach(dev, context); ret = driver->auto_attach(dev, context);
if (ret >= 0) if (ret >= 0)
ret = comedi_device_postconfig(dev); ret = comedi_device_postconfig(dev);