Commit 5b6f9b95 authored by David Kershner's avatar David Kershner Committed by Greg Kroah-Hartman

staging: unisys: visorbus: get rid of create_bus_type.

Create bus_type was just calling register_bustype. Since we control how
many times we call create_bus_type it was extraneous keeping a counter if
the bus was already registered, so the functions were no longer needed.
Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Reviewed-by: default avatarReviewed-by: Tim Sell <timothy.sell@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 362f87f3
...@@ -33,7 +33,6 @@ static int visorbus_forcenomatch; ...@@ -33,7 +33,6 @@ static int visorbus_forcenomatch;
#define CURRENT_FILE_PC VISOR_BUS_PC_visorbus_main_c #define CURRENT_FILE_PC VISOR_BUS_PC_visorbus_main_c
#define POLLJIFFIES_NORMALCHANNEL 10 #define POLLJIFFIES_NORMALCHANNEL 10
static int busreg_rc = -ENODEV; /* stores the result from bus registration */
static struct dentry *visorbus_debugfs_dir; static struct dentry *visorbus_debugfs_dir;
/* /*
...@@ -967,9 +966,6 @@ int visorbus_register_visor_driver(struct visor_driver *drv) ...@@ -967,9 +966,6 @@ int visorbus_register_visor_driver(struct visor_driver *drv)
{ {
int rc = 0; int rc = 0;
if (busreg_rc < 0)
return -ENODEV; /*can't register on a nonexistent bus*/
drv->driver.name = drv->name; drv->driver.name = drv->name;
drv->driver.bus = &visorbus_type; drv->driver.bus = &visorbus_type;
drv->driver.probe = visordriver_probe_device; drv->driver.probe = visordriver_probe_device;
...@@ -1080,29 +1076,6 @@ remove_bus_instance(struct visor_device *dev) ...@@ -1080,29 +1076,6 @@ remove_bus_instance(struct visor_device *dev)
device_unregister(&dev->device); device_unregister(&dev->device);
} }
/*
* create_bus_type() - create and register the one-and-only one instance of
* the visor bus type (visorbus_type)
* Return: 0 for success, otherwise negative errno value returned by
* bus_register() indicating the reason for failure
*/
static int
create_bus_type(void)
{
busreg_rc = bus_register(&visorbus_type);
return busreg_rc;
}
/*
* remove_bus_type() - remove the one-and-only one instance of the visor bus
* type (visorbus_type)
*/
static void
remove_bus_type(void)
{
bus_unregister(&visorbus_type);
}
/* /*
* remove_all_visor_devices() - remove all child visor bus device instances * remove_all_visor_devices() - remove all child visor bus device instances
*/ */
...@@ -1335,7 +1308,7 @@ visorbus_init(void) ...@@ -1335,7 +1308,7 @@ visorbus_init(void)
bus_device_info_init(&clientbus_driverinfo, "clientbus", "visorbus"); bus_device_info_init(&clientbus_driverinfo, "clientbus", "visorbus");
err = create_bus_type(); err = bus_register(&visorbus_type);
if (err < 0) { if (err < 0) {
POSTCODE_LINUX(BUS_CREATE_ENTRY_PC, 0, 0, DIAG_SEVERITY_ERR); POSTCODE_LINUX(BUS_CREATE_ENTRY_PC, 0, 0, DIAG_SEVERITY_ERR);
goto error; goto error;
...@@ -1363,7 +1336,8 @@ visorbus_exit(void) ...@@ -1363,7 +1336,8 @@ visorbus_exit(void)
list_all); list_all);
remove_bus_instance(dev); remove_bus_instance(dev);
} }
remove_bus_type();
bus_unregister(&visorbus_type);
debugfs_remove_recursive(visorbus_debugfs_dir); debugfs_remove_recursive(visorbus_debugfs_dir);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment