Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 18395
b: refs/heads/master
c: ac33bc3
h: refs/heads/master
i:
  18393: a1d369b
  18391: e283b72
v: v3
  • Loading branch information
Russell King authored and Greg Kroah-Hartman committed Jan 13, 2006
1 parent 220784c commit 51c2b60
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ff2dae79773658eaaab731663ddca9f7975430eb
refs/heads/master: ac33bc3d54936d364c1f979e50f43dfa3f9a13c1
15 changes: 7 additions & 8 deletions trunk/drivers/usb/serial/bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ static int usb_serial_device_match (struct device *dev, struct device_driver *dr
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;
Expand Down Expand Up @@ -109,14 +104,18 @@ static int usb_serial_device_remove (struct device *dev)
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;
Expand Down

0 comments on commit 51c2b60

Please sign in to comment.