USB: fixed problems when CONFIG_HOTPLUG=n and usb drivers were built into the kernel.

removed __devinitdata and __devinit on structures and functions that should
not have them.
Thanks to Tom Rini for pointing this out.

diff --git a/drivers/usb/media/ov511.c b/drivers/usb/media/ov511.c
index 790e9cf2f1da4d7d76c5d1dd4e4074e220d389b4..e5b3f9144fb44380128f86a9c47e94eed266a728 100644 (file)
--- a/drivers/usb/media/ov511.c
+++ b/drivers/usb/media/ov511.c
@@ -233,7 +233,7 @@ static int i2c_detect_tries = 5;
 #define ov51x_mmx_available (0)
 #endif
 
-static __devinitdata struct usb_device_id device_table [] = {
+static struct usb_device_id device_table [] = {
        { USB_DEVICE(VEND_OMNIVISION, PROD_OV511) },
        { USB_DEVICE(VEND_OMNIVISION, PROD_OV511PLUS) },
        { USB_DEVICE(VEND_OMNIVISION, PROD_OV518) },

diff --git a/drivers/usb/media/pwc-if.c b/drivers/usb/media/pwc-if.c
index 084d7a8fcaf1ea209f1ff44c796d81254160673a..7f49d02d731681d8ef2524d9bcb273c97834bf26 100644 (file)
--- a/drivers/usb/media/pwc-if.c
+++ b/drivers/usb/media/pwc-if.c
@@ -66,7 +66,7 @@
 /* Function prototypes and driver templates */
 
 /* hotplug device table support */
-static __devinitdata struct usb_device_id pwc_device_table [] = {
+static struct usb_device_id pwc_device_table [] = {
        { USB_DEVICE(0x0471, 0x0302) },
        { USB_DEVICE(0x0471, 0x0303) },
        { USB_DEVICE(0x0471, 0x0304) },

diff --git a/drivers/usb/media/se401.c b/drivers/usb/media/se401.c
index 90108c2aa301d75bf49e547ea5fb836f82d6f7b5..b9e7538d38229a8c35ce9b48da634e00e659a1b7 100644 (file)
--- a/drivers/usb/media/se401.c
+++ b/drivers/usb/media/se401.c
@@ -29,7 +29,6 @@ static const char version[] = "0.23";
 
 #include <linux/config.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/vmalloc.h>
@@ -42,18 +41,12 @@ static const char version[] = "0.23";
 #include <linux/wrapper.h>
 #include <linux/mm.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 0)
-#define virt_to_page(arg)      MAP_NR(arg)
-#define vmalloc_32             vmalloc
-#endif
-
 #include "se401.h"
 
 static int flickerless=0;
 static int video_nr = -1;
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 3, 0)
-static __devinitdata struct usb_device_id device_table [] = {
+static struct usb_device_id device_table [] = {
        { USB_DEVICE(0x03e8, 0x0004) },/* Endpoints/Aox SE401 */
        { USB_DEVICE(0x0471, 0x030b) },/* Philips PCVC665K */
        { USB_DEVICE(0x047d, 0x5001) },/* Kensington 67014 */
@@ -63,7 +56,6 @@ static __devinitdata struct usb_device_id device_table [] = {
 };
 
 MODULE_DEVICE_TABLE(usb, device_table);
-#endif
 
 MODULE_AUTHOR("Jeroen Vreeken <pe1rxq@amsat.org>");
 MODULE_DESCRIPTION("SE401 USB Camera Driver");
@@ -1402,12 +1394,8 @@ static int se401_init(struct usb_se401 *se401)
         return 0;
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 0)
-static void* se401_probe(struct usb_device *dev, unsigned int ifnum)
-#else
-static void* __devinit se401_probe(struct usb_device *dev, unsigned int ifnum,
+static void* se401_probe(struct usb_device *dev, unsigned int ifnum,
        const struct usb_device_id *id)
-#endif
 {
         struct usb_interface_descriptor *interface;
         struct usb_se401 *se401;
@@ -1535,9 +1523,7 @@ static inline void usb_se401_remove_disconnected (struct usb_se401 *se401)
 
 static struct usb_driver se401_driver = {
         name:          "se401",
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 3, 0)
         id_table:      device_table,
-#endif
        probe:          se401_probe,
         disconnect:    se401_disconnect
 };

diff --git a/drivers/usb/media/stv680.c b/drivers/usb/media/stv680.c
index 33bac843d1eedd3045be49597a1d2109f3c6cc01..d2c191a99a16a712d28f51b39f12b8850b326f9b 100644 (file)
--- a/drivers/usb/media/stv680.c
+++ b/drivers/usb/media/stv680.c
@@ -1449,7 +1449,7 @@ static struct video_device stv680_template = {
        fops:           &stv680_fops,
 };
 
-static void *__devinit stv680_probe (struct usb_device *dev, unsigned int ifnum, const struct usb_device_id *id)
+static void *stv680_probe (struct usb_device *dev, unsigned int ifnum, const struct usb_device_id *id)
 {
        struct usb_interface_descriptor *interface;
        struct usb_stv *stv680;

diff --git a/drivers/usb/media/stv680.h b/drivers/usb/media/stv680.h
index 3c0bd3ecc09de9cab4339f6a20a384c2cbfeea0b..7d8bcbfdbf5d1f2e31e3d84b20c4e30a0dd910fb 100644 (file)
--- a/drivers/usb/media/stv680.h
+++ b/drivers/usb/media/stv680.h
@@ -45,7 +45,7 @@
 /* fmt 4 */
 #define STV_VIDEO_PALETTE       VIDEO_PALETTE_RGB24
 
-static __devinitdata struct usb_device_id device_table[] = {
+static struct usb_device_id device_table[] = {
        {USB_DEVICE (USB_PENCAM_VENDOR_ID, USB_PENCAM_PRODUCT_ID)},
        {}
 };

diff --git a/drivers/usb/media/vicam.c b/drivers/usb/media/vicam.c
index bed0fa5caeb2458e6c38f95b0d846c57854a5add..51ed32717520775b7133f311323e18c894ee8247 100644 (file)
--- a/drivers/usb/media/vicam.c
+++ b/drivers/usb/media/vicam.c
@@ -787,7 +787,7 @@ error:
        return 1;
 }
 
-static void * __devinit vicam_probe(struct usb_device *udev, unsigned int ifnum,
+static void *vicam_probe(struct usb_device *udev, unsigned int ifnum,
        const struct usb_device_id *id)
 {
        struct usb_vicam *vicam;

diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c
index d7ab94c9e71894f0effaa41379f87b1464e30aeb..66b777559d616bc5cd221135a6299e647ce9e058 100644 (file)
--- a/drivers/usb/serial/belkin_sa.c
+++ b/drivers/usb/serial/belkin_sa.c
@@ -103,7 +103,7 @@ static int  belkin_sa_ioctl         (struct usb_serial_port *port, struct file * file,
 static void belkin_sa_break_ctl                (struct usb_serial_port *port, int break_state );
 
 
-static __devinitdata struct usb_device_id id_table_combined [] = {
+static struct usb_device_id id_table_combined [] = {
        { USB_DEVICE(BELKIN_SA_VID, BELKIN_SA_PID) },
        { USB_DEVICE(BELKIN_OLD_VID, BELKIN_OLD_PID) },
        { USB_DEVICE(PERACOM_VID, PERACOM_PID) },

diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index 1f44a16bef573bc51236007fbcc0b588af406dae..b27abfbde79a5e2a0feabd88edc8cd8a7373ad37 100644 (file)
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -66,7 +66,7 @@ static void cyberjack_read_int_callback( struct urb *urb );
 static void cyberjack_read_bulk_callback (struct urb *urb);
 static void cyberjack_write_bulk_callback (struct urb *urb);
 
-static __devinitdata struct usb_device_id id_table [] = {
+static struct usb_device_id id_table [] = {
        { USB_DEVICE(CYBERJACK_VENDOR_ID, CYBERJACK_PRODUCT_ID) },
        { }                     /* Terminating entry */
 };

diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index 336cccce5fc0aa8193739e13164096debfd64f20..9eeb135b10bdd1287ea40b55b229e95cadf99f26 100644 (file)
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@ -483,12 +483,12 @@ static __devinitdata struct usb_device_id id_table_combined [] = {
        { }                                             /* Terminating entry */
 };
 
-static __devinitdata struct usb_device_id id_table_2 [] = {
+static struct usb_device_id id_table_2 [] = {
        { USB_DEVICE(DIGI_VENDOR_ID, DIGI_2_ID) },
        { }                                             /* Terminating entry */
 };
 
-static __devinitdata struct usb_device_id id_table_4 [] = {
+static struct usb_device_id id_table_4 [] = {
        { USB_DEVICE(DIGI_VENDOR_ID, DIGI_4_ID) },
        { }                                             /* Terminating entry */
 };

diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c
index 1494c4c465f63342de603aee81d7a8dc8e849dad..321def93ed4e6b1ce12173acf7a926ff0f119424 100644 (file)
--- a/drivers/usb/serial/empeg.c
+++ b/drivers/usb/serial/empeg.c
@@ -103,7 +103,7 @@ static void empeg_set_termios               (struct usb_serial_port *port, struct termios *ol
 static void empeg_write_bulk_callback  (struct urb *urb);
 static void empeg_read_bulk_callback   (struct urb *urb);
 
-static __devinitdata struct usb_device_id id_table [] = {
+static struct usb_device_id id_table [] = {
        { USB_DEVICE(EMPEG_VENDOR_ID, EMPEG_PRODUCT_ID) },
        { }                                     /* Terminating entry */
 };

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index f1c071d51626adb4218ebaf59cec057ba46ad22d..1f626f56c3f8a27a772d87296b60932fa77f17ae 100644 (file)
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -120,7 +120,7 @@
 #define DRIVER_AUTHOR "Greg Kroah-Hartman <greg@kroah.com>, Bill Ryder <bryder@sgi.com>"
 #define DRIVER_DESC "USB FTDI RS232 Converters Driver"
 
-static __devinitdata struct usb_device_id id_table_sio [] = {
+static struct usb_device_id id_table_sio [] = {
        { USB_DEVICE(FTDI_VID, FTDI_SIO_PID) },
        { }                                             /* Terminating entry */
 };
@@ -133,7 +133,7 @@ static __devinitdata struct usb_device_id id_table_sio [] = {
   */
 
    
-static __devinitdata struct usb_device_id id_table_8U232AM [] = {
+static struct usb_device_id id_table_8U232AM [] = {
        { USB_DEVICE(FTDI_VID, FTDI_8U232AM_PID) },
        { USB_DEVICE(FTDI_NF_RIC_VID, FTDI_NF_RIC_PID) },
        { }                                             /* Terminating entry */

diff --git a/drivers/usb/serial/io_tables.h b/drivers/usb/serial/io_tables.h
index 527fefea91d5c30a73ddb2ffc28de225820ad860..92f12b38b1c4df15d5e688249d41550bd377750f 100644 (file)
--- a/drivers/usb/serial/io_tables.h
+++ b/drivers/usb/serial/io_tables.h
@@ -14,12 +14,12 @@
 #ifndef IO_TABLES_H
 #define IO_TABLES_H
 
-static __devinitdata struct usb_device_id edgeport_1port_id_table [] = {
+static struct usb_device_id edgeport_1port_id_table [] = {
        { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_PARALLEL_PORT) },
        { }
 };
 
-static __devinitdata struct usb_device_id edgeport_2port_id_table [] = {
+static struct usb_device_id edgeport_2port_id_table [] = {
        { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_2) },
        { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_2I) },
        { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_421) },
@@ -33,7 +33,7 @@ static __devinitdata struct usb_device_id edgeport_2port_id_table [] = {
        { }
 };
 
-static __devinitdata struct usb_device_id edgeport_4port_id_table [] = {
+static struct usb_device_id edgeport_4port_id_table [] = {
        { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_4) },
        { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_RAPIDPORT_4) },
        { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_4T) },
@@ -50,7 +50,7 @@ static __devinitdata struct usb_device_id edgeport_4port_id_table [] = {
        { }
 };
 
-static __devinitdata struct usb_device_id edgeport_8port_id_table [] = {
+static struct usb_device_id edgeport_8port_id_table [] = {
        { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_8) },
        { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_16_DUAL_CPU) },
        { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_8I) },

diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index be4a000926ff0e69308e7f527595f8bd0b6f4873..6eda40f2fff70d2e4a84506fd53f23bc4705a53d 100644 (file)
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -78,7 +78,7 @@ static int ipaq_chars_in_buffer(struct usb_serial_port *port);
 static void ipaq_destroy_lists(struct usb_serial_port *port);
 
 
-static __devinitdata struct usb_device_id ipaq_id_table [] = {
+static struct usb_device_id ipaq_id_table [] = {
        { USB_DEVICE(COMPAQ_VENDOR_ID, COMPAQ_IPAQ_ID) },
        { USB_DEVICE(HP_VENDOR_ID, HP_JORNADA_548_ID) },
        { USB_DEVICE(HP_VENDOR_ID, HP_JORNADA_568_ID) },

diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c
index cd6be687bd64b550f0a69f481469b1bb9b0b65a8..f1229f559ff7efb922a1d14d2c3ddf273d176a2b 100644 (file)
--- a/drivers/usb/serial/ir-usb.c
+++ b/drivers/usb/serial/ir-usb.c
@@ -119,7 +119,7 @@ static u8 ir_baud = 0;
 static u8 ir_xbof = 0;
 static u8 ir_add_bof = 0;
 
-static __devinitdata struct usb_device_id id_table [] = {
+static struct usb_device_id id_table [] = {
        { USB_DEVICE(0x050f, 0x0180) },         /* KC Technology, KC-180 */
        { USB_DEVICE(0x08e9, 0x0100) },         /* XTNDAccess */
        { USB_DEVICE(0x09c4, 0x0011) },         /* ACTiSys ACT-IR2000U */

diff --git a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h
index 0d12b66d20da37fd0e5adbcee7afdbd277c70571..76f1d938adcaa9082ab06c4160642f83b82533c0 100644 (file)
--- a/drivers/usb/serial/keyspan.h
+++ b/drivers/usb/serial/keyspan.h
@@ -435,7 +435,7 @@ static __devinitdata struct usb_device_id keyspan_ids_combined[] = {
 MODULE_DEVICE_TABLE(usb, keyspan_ids_combined);
 
 /* usb_device_id table for the pre-firmware download keyspan devices */
-static __devinitdata struct usb_device_id keyspan_pre_ids[] = {
+static struct usb_device_id keyspan_pre_ids[] = {
        { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa18x_pre_product_id) },
        { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa19_pre_product_id) },
        { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa19qi_pre_product_id) },
@@ -449,7 +449,7 @@ static __devinitdata struct usb_device_id keyspan_pre_ids[] = {
        { } /* Terminating entry */
 };
 
-static __devinitdata struct usb_device_id keyspan_1port_ids[] = {
+static struct usb_device_id keyspan_1port_ids[] = {
        { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa18x_product_id) },
        { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa19_product_id) },
        { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa19qi_product_id) },
@@ -458,14 +458,14 @@ static __devinitdata struct usb_device_id keyspan_1port_ids[] = {
        { } /* Terminating entry */
 };
 
-static __devinitdata struct usb_device_id keyspan_2port_ids[] = {
+static struct usb_device_id keyspan_2port_ids[] = {
        { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa28_product_id) },
        { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa28x_product_id) },
        { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa28xa_product_id) },
        { } /* Terminating entry */
 };
 
-static __devinitdata struct usb_device_id keyspan_4port_ids[] = {
+static struct usb_device_id keyspan_4port_ids[] = {
        { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa49w_product_id) },
        { } /* Terminating entry */
 };

diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index c1880dd6789ab477e449fe544bdc4073b5952abf..ee71618d6d88880222879d6e960a67e8c22be36c 100644 (file)
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -154,20 +154,20 @@ static __devinitdata struct usb_device_id id_table_combined [] = {
 
 MODULE_DEVICE_TABLE (usb, id_table_combined);
 
-static __devinitdata struct usb_device_id id_table_std [] = {
+static struct usb_device_id id_table_std [] = {
        { USB_DEVICE(KEYSPAN_VENDOR_ID, KEYSPAN_PDA_ID) },
        { }                                             /* Terminating entry */
 };
 
 #ifdef KEYSPAN
-static __devinitdata struct usb_device_id id_table_fake [] = {
+static struct usb_device_id id_table_fake [] = {
        { USB_DEVICE(KEYSPAN_VENDOR_ID, KEYSPAN_PDA_FAKE_ID) },
        { }                                             /* Terminating entry */
 };
 #endif
 
 #ifdef XIRCOM
-static __devinitdata struct usb_device_id id_table_fake_xircom [] = {
+static struct usb_device_id id_table_fake_xircom [] = {
         { USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID) },
         { USB_DEVICE(ENTREGRA_VENDOR_ID, ENTREGRA_FAKE_ID) },
         { }                                             

diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index a009e17eaf90f354a4b292f1cf3549f834405bc9..c2470da026dbd0c7d7d279dec201a9e5ebad5b8a 100644 (file)
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -109,7 +109,7 @@ static void klsi_105_break_ctl               (struct usb_serial_port *port,
 /*
  * All of the device info needed for the KLSI converters.
  */
-static __devinitdata struct usb_device_id id_table [] = {
+static struct usb_device_id id_table [] = {
        { USB_DEVICE(PALMCONNECT_VID, PALMCONNECT_PID) },
        { USB_DEVICE(KLSI_VID, KLSI_KL5KUSB105D_PID) },
        { }             /* Terminating entry */

diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index 766cc687c7485723bd5ac58bc3d0343d45da6eba..e1fdc9d562959a1bd9f86b5c6a82b77c64466494 100644 (file)
--- a/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@ -129,7 +129,7 @@ static void mct_u232_break_ctl               (struct usb_serial_port *port,
 /*
  * All of the device info needed for the MCT USB-RS232 converter.
  */
-static __devinitdata struct usb_device_id id_table_combined [] = {
+static struct usb_device_id id_table_combined [] = {
        { USB_DEVICE(MCT_U232_VID, MCT_U232_PID) },
        { USB_DEVICE(MCT_U232_VID, MCT_U232_SITECOM_PID) },
        { USB_DEVICE(MCT_U232_VID, MCT_U232_DU_H3SP_PID) },

diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index 960a2fe1d802e50f7f5057411a0bbca8cb3848cf..fbce2098e4fd3c97848b55d79cfaebf7afa23dd9 100644 (file)
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -76,7 +76,7 @@ static int  omninet_write             (struct usb_serial_port *port, int from_user, const u
 static int  omninet_write_room         (struct usb_serial_port *port);
 static void omninet_shutdown           (struct usb_serial *serial);
 
-static __devinitdata struct usb_device_id id_table [] = {
+static struct usb_device_id id_table [] = {
        { USB_DEVICE(ZYXEL_VENDOR_ID, ZYXEL_OMNINET_ID) },
        { }                                             /* Terminating entry */
 };

diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 662a88d130fa211ab4d543aae0bf9ba7e1f4aed8..32135432468ed70149ea8adc75781f8dd47bd5f8 100644 (file)
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -65,7 +65,7 @@
 
 
 
-static __devinitdata struct usb_device_id id_table [] = {
+static struct usb_device_id id_table [] = {
        { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID) },
        { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_RSAQ2) },
        { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID) },

diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c
index b92b14b3eedc070f58cf6f0a23dfc66ee3f206fb..6f0e86a65ae276896d1674a9d17cddf3aa842965 100644 (file)
--- a/drivers/usb/serial/safe_serial.c
+++ b/drivers/usb/serial/safe_serial.c
@@ -140,7 +140,7 @@ MODULE_PARM_DESC (padded, "Pad to full wMaxPacketSize On/Off");
         bInterfaceClass: (ic), \
         bInterfaceSubClass: (isc),
 
-static __devinitdata struct usb_device_id id_table[] = {
+static struct usb_device_id id_table[] = {
        {MY_USB_DEVICE (0x49f, 0xffff, CDC_DEVICE_CLASS, LINEO_INTERFACE_CLASS, LINEO_INTERFACE_SUBCLASS_SAFESERIAL)},  // Itsy
        {MY_USB_DEVICE (0x3f0, 0x2101, CDC_DEVICE_CLASS, LINEO_INTERFACE_CLASS, LINEO_INTERFACE_SUBCLASS_SAFESERIAL)},  // Calypso
        {MY_USB_DEVICE (0x4dd, 0x8001, CDC_DEVICE_CLASS, LINEO_INTERFACE_CLASS, LINEO_INTERFACE_SUBCLASS_SAFESERIAL)},  // Iris 

diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index e2561b69be17e8c9d40fdc2b287fdab0d1bd1110..02d4701fafd1d9cfc1e6d12fa8e3ca474ecca958 100644 (file)
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -177,7 +177,7 @@ static void visor_read_bulk_callback        (struct urb *urb);
 static int  clie_3_5_startup   (struct usb_serial *serial);
 
 
-static __devinitdata struct usb_device_id combined_id_table [] = {
+static struct usb_device_id id_table [] = {
        { USB_DEVICE(PALM_VENDOR_ID, PALM_M500_ID) },
        { USB_DEVICE(PALM_VENDOR_ID, PALM_M505_ID) },
        { USB_DEVICE(PALM_VENDOR_ID, PALM_M515_ID) },
@@ -191,12 +191,12 @@ static __devinitdata struct usb_device_id combined_id_table [] = {
        { }                                     /* Terminating entry */
 };
 
-static __devinitdata struct usb_device_id clie_id_3_5_table [] = {
+static struct usb_device_id clie_id_3_5_table [] = {
        { USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_3_5_ID) },
        { }                                     /* Terminating entry */
 };
 
-static __devinitdata struct usb_device_id id_table [] = {
+static __devinitdata struct usb_device_id id_table_combined [] = {
        { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_VISOR_ID) },
        { USB_DEVICE(PALM_VENDOR_ID, PALM_M500_ID) },
        { USB_DEVICE(PALM_VENDOR_ID, PALM_M505_ID) },
@@ -211,7 +211,7 @@ static __devinitdata struct usb_device_id id_table [] = {
        { }                                     /* Terminating entry */
 };
 
-MODULE_DEVICE_TABLE (usb, id_table);
+MODULE_DEVICE_TABLE (usb, id_table_combined);
 
 
 
@@ -219,7 +219,7 @@ MODULE_DEVICE_TABLE (usb, id_table);
 static struct usb_serial_device_type handspring_device = {
        owner:                  THIS_MODULE,
        name:                   "Handspring Visor / Palm 4.0 / Clié 4.x",
-       id_table:               combined_id_table,
+       id_table:               id_table,
        num_interrupt_in:       0,
        num_bulk_in:            2,
        num_bulk_out:           2,

diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index 615c86fa319d21728e810c614e635b8b8e7cc9d9..ba6aafce6fb2c7482122bd5a667d41fd95f9e4fe 100644 (file)
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -100,12 +100,12 @@
    separate ID tables, and then a third table that combines them
    just for the purpose of exporting the autoloading information.
 */
-static __devinitdata struct usb_device_id id_table_std [] = {
+static struct usb_device_id id_table_std [] = {
        { USB_DEVICE(CONNECT_TECH_VENDOR_ID, CONNECT_TECH_WHITE_HEAT_ID) },
        { }                                             /* Terminating entry */
 };
 
-static __devinitdata struct usb_device_id id_table_prerenumeration [] = {
+static struct usb_device_id id_table_prerenumeration [] = {
        { USB_DEVICE(CONNECT_TECH_VENDOR_ID, CONNECT_TECH_FAKE_WHITE_HEAT_ID) },
        { }                                             /* Terminating entry */
 };