From 99c0e2691736d56190764bfdc59f11b090cda4ff Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Thu, 27 Jun 2013 14:50:57 +0100 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/comedidev.h | 2 +- drivers/staging/comedi/drivers.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h index ab278942ebd1..98058b9097e6 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 a15934f94ab0..ba5d6d927a49 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);