summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Abbott <abbotti@mev.co.uk>2013-06-27 13:50:57 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-23 21:22:29 (GMT)
commit99c0e2691736d56190764bfdc59f11b090cda4ff (patch)
tree5caa182bfaef374f2c4e528f3ede0bcb458d67a6
parentee68080d2c4c8fdb0ff4b126cb7701d05d47a719 (diff)
downloadlinux-fsl-qoriq-99c0e2691736d56190764bfdc59f11b090cda4ff.tar.xz
staging: comedi: return void from comedi_driver_unregister()
'Unregister' functions generally return `void`. `comedi_driver_unregister()` currently returns an `int` errno value. Nothing looks at the return value. Change the return type to `void`. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/comedidev.h2
-rw-r--r--drivers/staging/comedi/drivers.c7
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index ab27894..98058b9 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -363,7 +363,7 @@ int comedi_auto_config(struct device *, struct comedi_driver *,
void comedi_auto_unconfig(struct device *);
int comedi_driver_register(struct comedi_driver *);
-int comedi_driver_unregister(struct comedi_driver *);
+void comedi_driver_unregister(struct comedi_driver *);
/**
* module_comedi_driver() - Helper macro for registering a comedi driver
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index a15934f..ba5d6d9 100644
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -559,7 +559,7 @@ int comedi_driver_register(struct comedi_driver *driver)
}
EXPORT_SYMBOL_GPL(comedi_driver_register);
-int comedi_driver_unregister(struct comedi_driver *driver)
+void comedi_driver_unregister(struct comedi_driver *driver)
{
struct comedi_driver *prev;
int i;
@@ -584,15 +584,14 @@ int comedi_driver_unregister(struct comedi_driver *driver)
if (comedi_drivers == driver) {
comedi_drivers = driver->next;
- return 0;
+ return;
}
for (prev = comedi_drivers; prev->next; prev = prev->next) {
if (prev->next == driver) {
prev->next = driver->next;
- return 0;
+ return;
}
}
- return -EINVAL;
}
EXPORT_SYMBOL_GPL(comedi_driver_unregister);