Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23d3d602 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

[PATCH] driver core: change bus_rescan_devices to return void 



No one was looking at the return value of bus_rescan_devices, and it
really wasn't anything that anyone in the kernel would ever care about.
So change it which enabled some counting code to be removed also.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent afdce75f

drivers/base/bus.c

+9 −18
Original line number Diff line number Diff line
@@ -483,31 +483,22 @@ void bus_remove_driver(struct device_driver * drv) 
/* Helper for bus_rescan_devices's iter */

static int bus_rescan_devices_helper(struct device *dev, void *data)

{

	int *count = data;



	if (!dev->driver && (device_attach(dev) > 0))

		(*count)++;



	if (!dev->driver)

		device_attach(dev);

	return 0;

}





/**

 * bus_rescan_devices - rescan devices on the bus for possible drivers

 * @bus: the bus to scan.

 *

 * This function will look for devices on the bus with no driver

 *	attached and rescan it against existing drivers to see if it

 *	matches any. Calls device_attach(). Returns the number of devices

 *	that were sucessfully bound to a driver.

 * attached and rescan it against existing drivers to see if it matches

 * any by calling device_attach() for the unbound devices.

 */

int bus_rescan_devices(struct bus_type * bus)

void bus_rescan_devices(struct bus_type * bus)

{

	int count = 0;



	bus_for_each_dev(bus, NULL, &count, bus_rescan_devices_helper);



	return count;

	bus_for_each_dev(bus, NULL, NULL, bus_rescan_devices_helper);

}

include/linux/device.h

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ struct bus_type { 
extern int bus_register(struct bus_type * bus);

extern void bus_unregister(struct bus_type * bus);



extern int bus_rescan_devices(struct bus_type * bus);

extern void bus_rescan_devices(struct bus_type * bus);



extern struct bus_type * get_bus(struct bus_type * bus);

extern void put_bus(struct bus_type * bus);