forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

USB: serial: remove bizarre generic_serial probe function

Browse source 
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>
This commit is contained in:
Greg Kroah-Hartman 2012-05-07 14:46:48 -07:00
commit 2edd284bd7
3 changed files with 1 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
drivers/usb/serial/generic.c
View file

@ -28,9 +28,6 @@ static int debug;
#ifdef CONFIG_USB_SERIAL_GENERIC #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 vendor = 0x05f9;
static __u16 product = 0xffff; static __u16 product = 0xffff;
@ -51,7 +48,6 @@ static const struct usb_device_id generic_serial_ids[] = {
static struct usb_driver generic_driver = { static struct usb_driver generic_driver = {
.name = "usbserial_generic", .name = "usbserial_generic",
.probe = generic_probe,
.id_table = generic_serial_ids, .id_table = generic_serial_ids,
}; };
@ -74,16 +70,6 @@ static struct usb_serial_driver * const serial_drivers[] = {
&usb_serial_generic_device, NULL &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 #endif
int usb_serial_generic_register(int _debug) int usb_serial_generic_register(int _debug)

2
drivers/usb/serial/usb-serial.c
View file

@ -699,7 +699,7 @@ static const struct tty_port_operations serial_port_ops = {
.shutdown = serial_down, .shutdown = serial_down,
}; };
int usb_serial_probe(struct usb_interface *interface, static int usb_serial_probe(struct usb_interface *interface,
const struct usb_device_id *id) const struct usb_device_id *id)
{ {
struct usb_device *dev = interface_to_usbdev(interface); struct usb_device *dev = interface_to_usbdev(interface);

3
include/linux/usb/serial.h
View file

@ -298,9 +298,6 @@ extern void usb_serial_deregister_drivers(struct usb_driver *udriver,
struct usb_serial_driver * const serial_drivers[]); struct usb_serial_driver * const serial_drivers[]);
extern void usb_serial_port_softint(struct usb_serial_port *port); extern void usb_serial_port_softint(struct usb_serial_port *port);
extern int usb_serial_probe(struct usb_interface *iface,
const struct usb_device_id *id);
extern int usb_serial_suspend(struct usb_interface *intf, pm_message_t message); extern int usb_serial_suspend(struct usb_interface *intf, pm_message_t message);
extern int usb_serial_resume(struct usb_interface *intf); extern int usb_serial_resume(struct usb_interface *intf);