AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

staging: comedi: refactor comedi_device_attach() a bit

Browse Source 
Split the post-config part of comedi_device_attach() into new function
comedi_device_postconfig() and rearrange the rest of the function a bit.

The new comedi_device_postconfig() function will be called by some new
bus-type-specific auto-attach functions.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott 2012-03-30 17:15:00 +01:00 committed by Greg Kroah-Hartman
parent d8b6ca0850
commit 3902a37028
1 changed files with 44 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,6 +106,26 @@ void comedi_device_detach(struct comedi_device *dev)
__comedi_device_detach(dev); __comedi_device_detach(dev);
} }
/* do a little post-config cleanup */
/* called with module refcount incremented, decrements it */
static int comedi_device_postconfig(struct comedi_device *dev)
{
int ret = postconfig(dev);
module_put(dev->driver->module);
if (ret < 0) {
__comedi_device_detach(dev);
return ret;
}
if (!dev->board_name) {
printk(KERN_WARNING "BUG: dev->board_name=<%p>\n",
dev->board_name);
dev->board_name = "BUG";
}
smp_wmb();
dev->attached = 1;
return 0;
}
int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it) int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{ {
struct comedi_driver *driv; struct comedi_driver *driv;
@ -121,59 +141,36 @@ int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it)
} }
if (driv->num_names) { if (driv->num_names) {
dev->board_ptr = comedi_recognize(driv, it->board_name); dev->board_ptr = comedi_recognize(driv, it->board_name);
if (dev->board_ptr == NULL) { if (dev->board_ptr)
module_put(driv->module); break;
continue; } else if (strcmp(driv->driver_name, it->board_name))
} break;
} else {
if (strcmp(driv->driver_name, it->board_name)) {
module_put(driv->module);
continue;
}
}
/* initialize dev->driver here so
* comedi_error() can be called from attach */
dev->driver = driv;
ret = driv->attach(dev, it);
if (ret < 0) {
module_put(dev->driver->module);
__comedi_device_detach(dev);
return ret;
}
goto attached;
}
/* recognize has failed if we get here */
/* report valid board names before returning error */
for (driv = comedi_drivers; driv; driv = driv->next) {
if (!try_module_get(driv->module)) {
printk(KERN_INFO
"comedi: failed to increment module count\n");
continue;
}
comedi_report_boards(driv);
module_put(driv->module); module_put(driv->module);
} }
return -EIO; if (driv == NULL) {
/* recognize has failed if we get here */
attached: /* report valid board names before returning error */
/* do a little post-config cleanup */ for (driv = comedi_drivers; driv; driv = driv->next) {
ret = postconfig(dev); if (!try_module_get(driv->module)) {
module_put(dev->driver->module); printk(KERN_INFO
"comedi: failed to increment module count\n");
continue;
}
comedi_report_boards(driv);
module_put(driv->module);
}
return -EIO;
}
/* initialize dev->driver here so
* comedi_error() can be called from attach */
dev->driver = driv;
ret = driv->attach(dev, it);
if (ret < 0) { if (ret < 0) {
module_put(dev->driver->module);
__comedi_device_detach(dev); __comedi_device_detach(dev);
return ret; return ret;
} }
return comedi_device_postconfig(dev);
if (!dev->board_name) {
printk(KERN_WARNING "BUG: dev->board_name=<%p>\n",
dev->board_name);
dev->board_name = "BUG";
}
smp_wmb();
dev->attached = 1;
return 0;
} }
int comedi_driver_register(struct comedi_driver *driver) int comedi_driver_register(struct comedi_driver *driver)