Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 259488
b: refs/heads/master
c: d012c2a
h: refs/heads/master
v: v3
  • Loading branch information
matt mooney authored and Greg Kroah-Hartman committed Jun 7, 2011
1 parent 5ddf809 commit 2d028b3
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 17 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: b7d27eadf8eff42efc6bdd5c41275c3708abb789
refs/heads/master: d012c2a5aca12abe1c7edc361447733861da9e95
28 changes: 12 additions & 16 deletions trunk/drivers/staging/usbip/stub_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,10 @@
#include "usbip_common.h"
#include "stub.h"

static int stub_probe(struct usb_interface *interface,
const struct usb_device_id *id);
static void stub_disconnect(struct usb_interface *interface);

/*
* Define device IDs here if you want to explicitly limit exportable devices.
* In the most cases, wild card matching will be ok because driver binding can
* be changed dynamically by a userland program.
* In most cases, wildcard matching will be okay because driver binding can be
* changed dynamically by a userland program.
*/
static struct usb_device_id stub_table[] = {
#if 0
Expand All @@ -54,16 +50,9 @@ static struct usb_device_id stub_table[] = {
};
MODULE_DEVICE_TABLE(usb, stub_table);

struct usb_driver stub_driver = {
.name = "usbip",
.probe = stub_probe,
.disconnect = stub_disconnect,
.id_table = stub_table,
};

/*
* usbip_status shows status of usbip as long as this driver is bound to the
* target device.
* usbip_status shows the status of usbip-host as long as this driver is bound
* to the target device.
*/
static ssize_t show_status(struct device *dev, struct device_attribute *attr,
char *buf)
Expand Down Expand Up @@ -423,7 +412,7 @@ static int stub_probe(struct usb_interface *interface,
return 0;
}

/* ok. this is my device. */
/* ok, this is my device */
sdev = stub_device_alloc(udev, interface);
if (!sdev)
return -ENOMEM;
Expand Down Expand Up @@ -534,3 +523,10 @@ static void stub_disconnect(struct usb_interface *interface)
del_match_busid((char *)udev_busid);
}
}

struct usb_driver stub_driver = {
.name = "usbip-host",
.probe = stub_probe,
.disconnect = stub_disconnect,
.id_table = stub_table,
};

0 comments on commit 2d028b3

Please sign in to comment.