diff options
author | Johannes Hölzl <johannes.hoelzl@gmx.de> | 2006-12-17 15:50:24 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-07 18:44:34 -0500 |
commit | d9b1b787736852f462dbf277b3ca708cbbf693ae (patch) | |
tree | 143d154a3f77bb3aff27fb74eed339f2713ed399 /drivers/usb/serial/mos7840.c | |
parent | 93bacefc4cc0b53e1cb6a336d43847154fdf6886 (diff) |
USB serial: add driver pointer to all usb-serial drivers
Every usb serial driver should have a pointer to the corresponding usb driver.
So the usb serial core can add a new id not only to the usb serial driver, but
also to the usb driver.
Also the usb drivers of ark3116, mos7720 and mos7840 missed the flag
no_dynamic_id=1. This is added now.
Signed-off-by: Johannes Hölzl <johannes.hoelzl@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/mos7840.c')
-rw-r--r-- | drivers/usb/serial/mos7840.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c index 83f661403ba1..b2264a87617b 100644 --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c | |||
@@ -2834,12 +2834,21 @@ static void mos7840_shutdown(struct usb_serial *serial) | |||
2834 | 2834 | ||
2835 | } | 2835 | } |
2836 | 2836 | ||
2837 | static struct usb_driver io_driver = { | ||
2838 | .name = "mos7840", | ||
2839 | .probe = usb_serial_probe, | ||
2840 | .disconnect = usb_serial_disconnect, | ||
2841 | .id_table = moschip_id_table_combined, | ||
2842 | .no_dynamic_id = 1, | ||
2843 | }; | ||
2844 | |||
2837 | static struct usb_serial_driver moschip7840_4port_device = { | 2845 | static struct usb_serial_driver moschip7840_4port_device = { |
2838 | .driver = { | 2846 | .driver = { |
2839 | .owner = THIS_MODULE, | 2847 | .owner = THIS_MODULE, |
2840 | .name = "mos7840", | 2848 | .name = "mos7840", |
2841 | }, | 2849 | }, |
2842 | .description = DRIVER_DESC, | 2850 | .description = DRIVER_DESC, |
2851 | .usb_driver = &io_driver, | ||
2843 | .id_table = moschip_port_id_table, | 2852 | .id_table = moschip_port_id_table, |
2844 | .num_interrupt_in = 1, //NUM_DONT_CARE,//1, | 2853 | .num_interrupt_in = 1, //NUM_DONT_CARE,//1, |
2845 | #ifdef check | 2854 | #ifdef check |
@@ -2869,13 +2878,6 @@ static struct usb_serial_driver moschip7840_4port_device = { | |||
2869 | .read_int_callback = mos7840_interrupt_callback, | 2878 | .read_int_callback = mos7840_interrupt_callback, |
2870 | }; | 2879 | }; |
2871 | 2880 | ||
2872 | static struct usb_driver io_driver = { | ||
2873 | .name = "mos7840", | ||
2874 | .probe = usb_serial_probe, | ||
2875 | .disconnect = usb_serial_disconnect, | ||
2876 | .id_table = moschip_id_table_combined, | ||
2877 | }; | ||
2878 | |||
2879 | /**************************************************************************** | 2881 | /**************************************************************************** |
2880 | * moschip7840_init | 2882 | * moschip7840_init |
2881 | * This is called by the module subsystem, or on startup to initialize us | 2883 | * This is called by the module subsystem, or on startup to initialize us |