Hi,

Here's a patch against 2.5.1-pre2 that merges together some of the USB
mct_u232 driver device structures.

thanks,

greg k-h



diff -Nru a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
--- a/drivers/usb/serial/mct_u232.c     Tue Nov 27 21:59:39 2001
+++ b/drivers/usb/serial/mct_u232.c     Tue Nov 27 21:59:39 2001
@@ -136,54 +136,12 @@
        { }             /* Terminating entry */
 };
 
-static __devinitdata struct usb_device_id mct_u232_table [] = {
-        { USB_DEVICE(MCT_U232_VID, MCT_U232_PID) },
-        { }                        /* Terminating entry */
-};
-
-static __devinitdata 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 [] = {
-        { USB_DEVICE(MCT_U232_VID, MCT_U232_DU_H3SP_PID) },
-        { }                        /* Terminating entry */
-};
-
 MODULE_DEVICE_TABLE (usb, id_table_combined);
 
 
 static struct usb_serial_device_type mct_u232_device = {
        name:                "Magic Control Technology USB-RS232",
-       id_table:            mct_u232_table,
-       needs_interrupt_in:  MUST_HAVE,  /* 2 interrupt-in endpoints */
-       needs_bulk_in:       MUST_HAVE_NOT,   /* no bulk-in endpoint */
-       needs_bulk_out:      MUST_HAVE,       /* 1 bulk-out endpoint */
-       num_interrupt_in:    2,
-       num_bulk_in:         0,
-       num_bulk_out:        1,
-       num_ports:           1,
-       open:                mct_u232_open,
-       close:               mct_u232_close,
-#ifdef FIX_WRITE_RETURN_CODE_PROBLEM
-       write:               mct_u232_write,
-       write_bulk_callback: mct_u232_write_bulk_callback,
-#endif
-       read_int_callback:   mct_u232_read_int_callback,
-       ioctl:               mct_u232_ioctl,
-       set_termios:         mct_u232_set_termios,
-       break_ctl:           mct_u232_break_ctl,
-       startup:             mct_u232_startup,
-       shutdown:            mct_u232_shutdown,
-};
-
-static struct usb_serial_device_type mct_u232_sitecom_device = {
-       name:                "MCT/Sitecom USB-RS232",
-       id_table:            mct_u232_sitecom_table,
-       needs_interrupt_in:  MUST_HAVE,  /* 2 interrupt-in endpoints */
-       needs_bulk_in:       MUST_HAVE_NOT,   /* no bulk-in endpoint */
-       needs_bulk_out:      MUST_HAVE,       /* 1 bulk-out endpoint */
+       id_table:            id_table_combined,
        num_interrupt_in:    2,
        num_bulk_in:         0,
        num_bulk_out:        1,
@@ -202,32 +160,6 @@
        shutdown:            mct_u232_shutdown,
 };
 
-static struct usb_serial_device_type mct_u232_du_h3sp_device = {
-        name:                "MCT/D-Link DU-H3SP USB BAY",
-        id_table:            mct_u232_du_h3sp_table,
-        needs_interrupt_in:  MUST_HAVE,  /* 2 interrupt-in endpoints */
-        needs_bulk_in:       MUST_HAVE_NOT,   /* no bulk-in endpoint */
-        needs_bulk_out:      MUST_HAVE,       /* 1 bulk-out endpoint */
-        num_interrupt_in:    2,
-        num_bulk_in:         0,
-        num_bulk_out:        1,
-        num_ports:           1,
-        open:                mct_u232_open,
-        close:               mct_u232_close,
-#ifdef FIX_WRITE_RETURN_CODE_PROBLEM
-        write:               mct_u232_write,
-        write_bulk_callback: mct_u232_write_bulk_callback,
-#endif
-        read_int_callback:   mct_u232_read_int_callback,
-        ioctl:               mct_u232_ioctl,
-        set_termios:         mct_u232_set_termios,
-        break_ctl:           mct_u232_break_ctl,
-        startup:             mct_u232_startup,
-        shutdown:            mct_u232_shutdown,
-};
-
-
-
 
 struct mct_u232_private {
        unsigned long        control_state; /* Modem Line Setting (TIOCM) */
@@ -880,9 +812,7 @@
 static int __init mct_u232_init (void)
 {
        usb_serial_register (&mct_u232_device);
-       usb_serial_register (&mct_u232_sitecom_device);
-       usb_serial_register (&mct_u232_du_h3sp_device);
-       info(DRIVER_VERSION ":" DRIVER_DESC);
+       info(DRIVER_DESC " " DRIVER_VERSION);
        return 0;
 }
 
@@ -890,8 +820,6 @@
 static void __exit mct_u232_exit (void)
 {
        usb_serial_deregister (&mct_u232_device);
-       usb_serial_deregister (&mct_u232_sitecom_device);
-       usb_serial_deregister (&mct_u232_du_h3sp_device);
 }
 
 


_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel

Reply via email to