diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-07 17:46:48 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-07 17:46:48 -0400 |
commit | 2edd284bd752e58ccb312f3d623267fb79857db3 (patch) | |
tree | 2ef946f6217718cf41d07c629f16b8a57936a56d /drivers/usb/serial/generic.c | |
parent | 3abee859c13ec6a0f49a7234eef011f5d45136f1 (diff) |
USB: serial: remove bizarre generic_serial probe function
I can't remember why I wrote it like this many many years ago, but it's
not needed at all, let's rely on the usb-serial core for this function,
especially as it is being overridden by it anyway.
This lets us make usb_serial_probe() a static function, which it should
be.
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/generic.c')
-rw-r--r-- | drivers/usb/serial/generic.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c index a2dcf0871811..4e5e993771e9 100644 --- a/drivers/usb/serial/generic.c +++ b/drivers/usb/serial/generic.c | |||
@@ -28,9 +28,6 @@ static int debug; | |||
28 | 28 | ||
29 | #ifdef CONFIG_USB_SERIAL_GENERIC | 29 | #ifdef CONFIG_USB_SERIAL_GENERIC |
30 | 30 | ||
31 | static int generic_probe(struct usb_interface *interface, | ||
32 | const struct usb_device_id *id); | ||
33 | |||
34 | static __u16 vendor = 0x05f9; | 31 | static __u16 vendor = 0x05f9; |
35 | static __u16 product = 0xffff; | 32 | static __u16 product = 0xffff; |
36 | 33 | ||
@@ -51,7 +48,6 @@ static const struct usb_device_id generic_serial_ids[] = { | |||
51 | 48 | ||
52 | static struct usb_driver generic_driver = { | 49 | static struct usb_driver generic_driver = { |
53 | .name = "usbserial_generic", | 50 | .name = "usbserial_generic", |
54 | .probe = generic_probe, | ||
55 | .id_table = generic_serial_ids, | 51 | .id_table = generic_serial_ids, |
56 | }; | 52 | }; |
57 | 53 | ||
@@ -74,16 +70,6 @@ static struct usb_serial_driver * const serial_drivers[] = { | |||
74 | &usb_serial_generic_device, NULL | 70 | &usb_serial_generic_device, NULL |
75 | }; | 71 | }; |
76 | 72 | ||
77 | static int generic_probe(struct usb_interface *interface, | ||
78 | const struct usb_device_id *id) | ||
79 | { | ||
80 | const struct usb_device_id *id_pattern; | ||
81 | |||
82 | id_pattern = usb_match_id(interface, generic_device_ids); | ||
83 | if (id_pattern != NULL) | ||
84 | return usb_serial_probe(interface, id); | ||
85 | return -ENODEV; | ||
86 | } | ||
87 | #endif | 73 | #endif |
88 | 74 | ||
89 | int usb_serial_generic_register(int _debug) | 75 | int usb_serial_generic_register(int _debug) |