From rmk+greg=kroah.com@arm.linux.org.uk Thu Jan 5 06:48:39 2006 From: Russell King CC: Greg K-H Subject: [CFT 26/29] Add usb_serial_bus_type probe and remove methods Date: Thu, 05 Jan 2006 14:43:11 +0000 Message-ID: <20060105142951.13.26@flint.arm.linux.org.uk> Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman --- drivers/usb/serial/bus.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) --- gregkh-2.6.orig/drivers/usb/serial/bus.c +++ gregkh-2.6/drivers/usb/serial/bus.c @@ -37,11 +37,6 @@ static int usb_serial_device_match (stru return 0; } -struct bus_type usb_serial_bus_type = { - .name = "usb-serial", - .match = usb_serial_device_match, -}; - static int usb_serial_device_probe (struct device *dev) { struct usb_serial_driver *driver; @@ -109,14 +104,18 @@ exit: return retval; } +struct bus_type usb_serial_bus_type = { + .name = "usb-serial", + .match = usb_serial_device_match, + .probe = usb_serial_device_probe, + .remove = usb_serial_device_remove, +}; + int usb_serial_bus_register(struct usb_serial_driver *driver) { int retval; driver->driver.bus = &usb_serial_bus_type; - driver->driver.probe = usb_serial_device_probe; - driver->driver.remove = usb_serial_device_remove; - retval = driver_register(&driver->driver); return retval;