summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/generic.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-07 14:46:48 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-07 14:46:48 -0700
commit2edd284bd752e58ccb312f3d623267fb79857db3 (patch)
tree2ef946f6217718cf41d07c629f16b8a57936a56d /drivers/usb/serial/generic.c
parent3abee859c13ec6a0f49a7234eef011f5d45136f1 (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.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index a2dcf087181..4e5e993771e 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -28,9 +28,6 @@ static int debug;
#ifdef CONFIG_USB_SERIAL_GENERIC
-static int generic_probe(struct usb_interface *interface,
- const struct usb_device_id *id);
-
static __u16 vendor = 0x05f9;
static __u16 product = 0xffff;
@@ -51,7 +48,6 @@ static const struct usb_device_id generic_serial_ids[] = {
static struct usb_driver generic_driver = {
.name = "usbserial_generic",
- .probe = generic_probe,
.id_table = generic_serial_ids,
};
@@ -74,16 +70,6 @@ static struct usb_serial_driver * const serial_drivers[] = {
&usb_serial_generic_device, NULL
};
-static int generic_probe(struct usb_interface *interface,
- const struct usb_device_id *id)
-{
- const struct usb_device_id *id_pattern;
-
- id_pattern = usb_match_id(interface, generic_device_ids);
- if (id_pattern != NULL)
- return usb_serial_probe(interface, id);
- return -ENODEV;
-}
#endif
int usb_serial_generic_register(int _debug)