On Wed, Jun 12, 2002 at 10:29:42AM -0700, Greg KH wrote:
> On Wed, Jun 12, 2002 at 09:36:42AM -0700, Tom Rini wrote:
> > On Wed, Jun 12, 2002 at 09:29:47AM -0700, Tom Rini wrote:
> > > On Wed, Jun 12, 2002 at 12:02:52AM +0200, Jeroen Vreeken wrote:
> > > > Is it possible to add some printk() calls in the probe function to
> > > > determine where it goes wrong?
> > [snip]
> > > And the prink I inserted at the top of the function never gets called.
> >
> > ... which is because se401_probe is __devinit (which turns into __init,
> > since CONFIG_HOTPLUG=n, and __init turns into '' when in a module).
> > Here's the lightly tested patch (for 2.4 and 2.5).
>
> And here's one that should get all of the __devinit issues for
> 2.4.19-pre10. I'll go make up a 2.5.21 version of this too.
Shouldn't the comment in include/linux/usb.h be updated to mention that
only tables used for MODULE_DEVICE_TABLE should be __devinitdata ?
Maybe:
- * Declare the table as __devinitdata, and as a MODULE_DEVICE_TABLE.
+ * Declare this table as a MODULE_DEVICE_TABLE and mark it as
+ * __devinitdata.
Or not, I'm not quite sure (but one of my co-workers pointed this out so
there's some confusion somewhere :)).
>
> thanks,
>
> greg k-h
>
>
> diff -Nru a/drivers/usb/ov511.c b/drivers/usb/ov511.c
> --- a/drivers/usb/ov511.c Wed Jun 12 10:23:09 2002
> +++ b/drivers/usb/ov511.c Wed Jun 12 10:23:09 2002
> @@ -335,7 +335,7 @@
> { -1, NULL }
> };
>
> -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 -Nru a/drivers/usb/pwc-if.c b/drivers/usb/pwc-if.c
> --- a/drivers/usb/pwc-if.c Wed Jun 12 10:23:09 2002
> +++ b/drivers/usb/pwc-if.c Wed Jun 12 10:23:09 2002
> @@ -65,7 +65,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) }, /* Philips models */
> { USB_DEVICE(0x0471, 0x0303) },
> { USB_DEVICE(0x0471, 0x0304) },
> diff -Nru a/drivers/usb/se401.c b/drivers/usb/se401.c
> --- a/drivers/usb/se401.c Wed Jun 12 10:23:09 2002
> +++ b/drivers/usb/se401.c Wed Jun 12 10:23:09 2002
> @@ -41,18 +41,12 @@
> #include <asm/semaphore.h>
> #include <linux/wrapper.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 */
> @@ -62,7 +56,6 @@
> };
>
> MODULE_DEVICE_TABLE(usb, device_table);
> -#endif
>
> MODULE_AUTHOR("Jeroen Vreeken <[EMAIL PROTECTED]>");
> MODULE_DESCRIPTION("SE401 USB Camera Driver");
> @@ -1446,12 +1439,8 @@
> 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;
> @@ -1580,9 +1569,7 @@
>
> 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 -Nru a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c
> --- a/drivers/usb/serial/belkin_sa.c Wed Jun 12 10:23:09 2002
> +++ b/drivers/usb/serial/belkin_sa.c Wed Jun 12 10:23:09 2002
> @@ -112,27 +112,27 @@
> { } /* Terminating entry */
> };
>
> -static __devinitdata struct usb_device_id belkin_dockstation_table [] = {
> +static struct usb_device_id belkin_dockstation_table [] = {
> { USB_DEVICE(BELKIN_DOCKSTATION_VID, BELKIN_DOCKSTATION_PID) },
> { } /* Terminating entry */
> };
>
> -static __devinitdata struct usb_device_id belkin_sa_table [] = {
> +static struct usb_device_id belkin_sa_table [] = {
> { USB_DEVICE(BELKIN_SA_VID, BELKIN_SA_PID) },
> { } /* Terminating entry */
> };
>
> -static __devinitdata struct usb_device_id belkin_old_table [] = {
> +static struct usb_device_id belkin_old_table [] = {
> { USB_DEVICE(BELKIN_OLD_VID, BELKIN_OLD_PID) },
> { } /* Terminating entry */
> };
>
> -static __devinitdata struct usb_device_id peracom_table [] = {
> +static struct usb_device_id peracom_table [] = {
> { USB_DEVICE(PERACOM_VID, PERACOM_PID) },
> { } /* Terminating entry */
> };
>
> -static __devinitdata struct usb_device_id gocom232_table [] = {
> +static struct usb_device_id gocom232_table [] = {
> { USB_DEVICE(GOHUBS_VID, GOHUBS_PID) },
> { } /* Terminating entry */
> };
> diff -Nru a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
> --- a/drivers/usb/serial/cyberjack.c Wed Jun 12 10:23:09 2002
> +++ b/drivers/usb/serial/cyberjack.c Wed Jun 12 10:23:09 2002
> @@ -69,7 +69,7 @@
> 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 -Nru a/drivers/usb/serial/digi_acceleport.c
>b/drivers/usb/serial/digi_acceleport.c
> --- a/drivers/usb/serial/digi_acceleport.c Wed Jun 12 10:23:09 2002
> +++ b/drivers/usb/serial/digi_acceleport.c Wed Jun 12 10:23:09 2002
> @@ -483,12 +483,12 @@
> { } /* 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 -Nru a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c
> --- a/drivers/usb/serial/empeg.c Wed Jun 12 10:23:09 2002
> +++ b/drivers/usb/serial/empeg.c Wed Jun 12 10:23:09 2002
> @@ -106,7 +106,7 @@
> 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 -Nru a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
> --- a/drivers/usb/serial/ftdi_sio.c Wed Jun 12 10:23:09 2002
> +++ b/drivers/usb/serial/ftdi_sio.c Wed Jun 12 10:23:09 2002
> @@ -123,7 +123,7 @@
> #define DRIVER_AUTHOR "Greg Kroah-Hartman <[EMAIL PROTECTED]>, Bill Ryder
><[EMAIL PROTECTED]>"
> #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 */
> };
> @@ -136,7 +136,7 @@
> */
>
>
> -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 -Nru a/drivers/usb/serial/io_tables.h b/drivers/usb/serial/io_tables.h
> --- a/drivers/usb/serial/io_tables.h Wed Jun 12 10:23:09 2002
> +++ b/drivers/usb/serial/io_tables.h Wed Jun 12 10:23:09 2002
> @@ -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_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_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 -Nru a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
> --- a/drivers/usb/serial/ipaq.c Wed Jun 12 10:23:09 2002
> +++ b/drivers/usb/serial/ipaq.c Wed Jun 12 10:23:09 2002
> @@ -81,7 +81,7 @@
> 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 -Nru a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c
> --- a/drivers/usb/serial/ir-usb.c Wed Jun 12 10:23:09 2002
> +++ b/drivers/usb/serial/ir-usb.c Wed Jun 12 10:23:09 2002
> @@ -91,7 +91,7 @@
> 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 -Nru a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h
> --- a/drivers/usb/serial/keyspan.h Wed Jun 12 10:23:09 2002
> +++ b/drivers/usb/serial/keyspan.h Wed Jun 12 10:23:09 2002
> @@ -372,77 +372,77 @@
> ID pattern. But, for now, it looks like we need slightly different
> behavior for each match. */
>
> -static __devinitdata struct usb_device_id keyspan_usa18x_pre_ids[] = {
> +static struct usb_device_id keyspan_usa18x_pre_ids[] = {
> { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa18x_pre_product_id) },
> { } /* Terminating entry */
> };
>
> -static __devinitdata struct usb_device_id keyspan_usa19_pre_ids[] = {
> +static struct usb_device_id keyspan_usa19_pre_ids[] = {
> { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa19_pre_product_id) },
> { } /* Terminating entry */
> };
>
> -static __devinitdata struct usb_device_id keyspan_usa19w_pre_ids[] = {
> +static struct usb_device_id keyspan_usa19w_pre_ids[] = {
> { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa19w_pre_product_id) },
> { } /* Terminating entry */
> };
>
> -static __devinitdata struct usb_device_id keyspan_usa28_pre_ids[] = {
> +static struct usb_device_id keyspan_usa28_pre_ids[] = {
> { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa28_pre_product_id) },
> { } /* Terminating entry */
> };
>
> -static __devinitdata struct usb_device_id keyspan_usa28x_pre_ids[] = {
> +static struct usb_device_id keyspan_usa28x_pre_ids[] = {
> { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa28x_pre_product_id) },
> { } /* Terminating entry */
> };
>
> -static __devinitdata struct usb_device_id keyspan_usa28xa_pre_ids[] = {
> +static struct usb_device_id keyspan_usa28xa_pre_ids[] = {
> { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa28xa_pre_product_id) },
> { } /* Terminating entry */
> };
>
> -static __devinitdata struct usb_device_id keyspan_usa28xb_pre_ids[] = {
> +static struct usb_device_id keyspan_usa28xb_pre_ids[] = {
> { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa28xb_pre_product_id) },
> { } /* Terminating entry */
> };
>
> -static __devinitdata struct usb_device_id keyspan_usa49w_pre_ids[] = {
> +static struct usb_device_id keyspan_usa49w_pre_ids[] = {
> { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa49w_pre_product_id) },
> { } /* Terminating entry */
> };
>
> -static __devinitdata struct usb_device_id keyspan_usa18x_ids[] = {
> +static struct usb_device_id keyspan_usa18x_ids[] = {
> { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa18x_product_id) },
> { } /* Terminating entry */
> };
>
> -static __devinitdata struct usb_device_id keyspan_usa19_ids[] = {
> +static struct usb_device_id keyspan_usa19_ids[] = {
> { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa19_product_id) },
> { } /* Terminating entry */
> };
>
> -static __devinitdata struct usb_device_id keyspan_usa19w_ids[] = {
> +static struct usb_device_id keyspan_usa19w_ids[] = {
> { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa19w_product_id) },
> { } /* Terminating entry */
> };
>
> -static __devinitdata struct usb_device_id keyspan_usa28_ids[] = {
> +static struct usb_device_id keyspan_usa28_ids[] = {
> { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa28_product_id) },
> { } /* Terminating entry */
> };
>
> -static __devinitdata struct usb_device_id keyspan_usa28x_ids[] = {
> +static struct usb_device_id keyspan_usa28x_ids[] = {
> { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa28x_product_id) },
> { } /* Terminating entry */
> };
>
> -static __devinitdata struct usb_device_id keyspan_usa28xa_ids[] = {
> +static struct usb_device_id keyspan_usa28xa_ids[] = {
> { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa28xa_product_id) },
> { } /* Terminating entry */
> };
>
> -static __devinitdata struct usb_device_id keyspan_usa49w_ids[] = {
> +static struct usb_device_id keyspan_usa49w_ids[] = {
> { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa49w_product_id) },
> { } /* Terminating entry */
> };
> diff -Nru a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
> --- a/drivers/usb/serial/keyspan_pda.c Wed Jun 12 10:23:09 2002
> +++ b/drivers/usb/serial/keyspan_pda.c Wed Jun 12 10:23:09 2002
> @@ -157,25 +157,25 @@
>
> 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) },
> { }
> };
>
> -static __devinitdata struct usb_device_id id_table_fake_entregra [] = {
> +static struct usb_device_id id_table_fake_entregra [] = {
> { USB_DEVICE(ENTREGRA_VENDOR_ID, ENTREGRA_FAKE_ID) },
> { }
> };
> diff -Nru a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
> --- a/drivers/usb/serial/kl5kusb105.c Wed Jun 12 10:23:09 2002
> +++ b/drivers/usb/serial/kl5kusb105.c Wed Jun 12 10:23:09 2002
> @@ -119,12 +119,12 @@
> { } /* Terminating entry */
> };
>
> -static __devinitdata struct usb_device_id palmconnect_table [] = {
> +static struct usb_device_id palmconnect_table [] = {
> { USB_DEVICE(PALMCONNECT_VID, PALMCONNECT_PID) },
> { } /* Terminating entry */
> };
>
> -static __devinitdata struct usb_device_id kl5kusb105d_table [] = {
> +static struct usb_device_id kl5kusb105d_table [] = {
> { USB_DEVICE(KLSI_VID, KLSI_KL5KUSB105D_PID) },
> { } /* Terminating entry */
> };
> diff -Nru a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
> --- a/drivers/usb/serial/mct_u232.c Wed Jun 12 10:23:09 2002
> +++ b/drivers/usb/serial/mct_u232.c Wed Jun 12 10:23:09 2002
> @@ -140,18 +140,18 @@
> { } /* Terminating entry */
> };
>
> -static __devinitdata struct usb_device_id mct_u232_table [] = {
> +static struct usb_device_id mct_u232_table [] = {
> { USB_DEVICE(MCT_U232_VID, MCT_U232_PID) },
> { USB_DEVICE(MCT_U232_BELKIN_F5U109_VID, MCT_U232_BELKIN_F5U109_PID) },
> { } /* Terminating entry */
> };
>
> -static __devinitdata struct usb_device_id mct_u232_sitecom_table [] = {
> +static struct usb_device_id mct_u232_sitecom_table [] = {
> { USB_DEVICE(MCT_U232_VID, MCT_U232_SITECOM_PID) },
> { } /* Terminating entry */
> };
>
> -static __devinitdata struct usb_device_id mct_u232_du_h3sp_table [] = {
> +static struct usb_device_id mct_u232_du_h3sp_table [] = {
> { USB_DEVICE(MCT_U232_VID, MCT_U232_DU_H3SP_PID) },
> { } /* Terminating entry */
> };
> diff -Nru a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
> --- a/drivers/usb/serial/omninet.c Wed Jun 12 10:23:09 2002
> +++ b/drivers/usb/serial/omninet.c Wed Jun 12 10:23:09 2002
> @@ -79,7 +79,7 @@
> 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 -Nru a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
> --- a/drivers/usb/serial/pl2303.c Wed Jun 12 10:23:09 2002
> +++ b/drivers/usb/serial/pl2303.c Wed Jun 12 10:23:09 2002
> @@ -64,7 +64,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 -Nru a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
> --- a/drivers/usb/serial/visor.c Wed Jun 12 10:23:09 2002
> +++ b/drivers/usb/serial/visor.c Wed Jun 12 10:23:09 2002
> @@ -170,12 +170,12 @@
> static int clie_3_5_startup (struct usb_serial *serial);
>
>
> -static __devinitdata struct usb_device_id visor_id_table [] = {
> +static struct usb_device_id visor_id_table [] = {
> { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_VISOR_ID) },
> { } /* Terminating entry */
> };
>
> -static __devinitdata struct usb_device_id palm_4_0_id_table [] = {
> +static struct usb_device_id palm_4_0_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) },
> @@ -185,19 +185,19 @@
> { } /* 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 clie_id_4_0_table [] = {
> +static struct usb_device_id clie_id_4_0_table [] = {
> { USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_4_0_ID) },
> { USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_S360_ID) },
> { USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_4_1_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) },
> @@ -212,7 +212,7 @@
> { } /* Terminating entry */
> };
>
> -MODULE_DEVICE_TABLE (usb, id_table);
> +MODULE_DEVICE_TABLE (usb, id_table_combined);
>
>
>
> diff -Nru a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
> --- a/drivers/usb/serial/whiteheat.c Wed Jun 12 10:23:09 2002
> +++ b/drivers/usb/serial/whiteheat.c Wed Jun 12 10:23:09 2002
> @@ -103,12 +103,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 */
> };
> diff -Nru a/drivers/usb/stv680.c b/drivers/usb/stv680.c
> --- a/drivers/usb/stv680.c Wed Jun 12 10:23:09 2002
> +++ b/drivers/usb/stv680.c Wed Jun 12 10:23:09 2002
> @@ -1494,7 +1494,7 @@
> initialize: stv_init_done,
> };
>
> -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 -Nru a/drivers/usb/stv680.h b/drivers/usb/stv680.h
> --- a/drivers/usb/stv680.h Wed Jun 12 10:23:09 2002
> +++ b/drivers/usb/stv680.h Wed Jun 12 10:23:09 2002
> @@ -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 -Nru a/drivers/usb/vicam.c b/drivers/usb/vicam.c
> --- a/drivers/usb/vicam.c Wed Jun 12 10:23:09 2002
> +++ b/drivers/usb/vicam.c Wed Jun 12 10:23:09 2002
> @@ -809,7 +809,7 @@
> 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;
>
> _______________________________________________________________
>
> Sponsored by:
> ThinkGeek at http://www.ThinkGeek.com/
> _______________________________________________
> [EMAIL PROTECTED]
> To unsubscribe, use the last form field at:
> https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
--
Tom Rini (TR1265)
http://gate.crashing.org/~trini/
_______________________________________________________________
Sponsored by:
ThinkGeek at http://www.ThinkGeek.com/
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
