[PATCH] USB storage: unusual_devs.h cleanups

This patch re-sorts unusual_devs.h and removes some duplicate entries.

diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index bd851170e5f32b813742c9ee200dfdf69f935e9b..7aad3d09f67d2c4bd55d4032a403e00155212365 100644 (file)
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -252,6 +252,14 @@ UNUSUAL_DEV(  0x054c, 0x0025, 0x0100, 0x0100,
                US_SC_UFI, US_PR_CB, NULL,
                US_FL_SINGLE_LUN ),
 
+#ifdef CONFIG_USB_STORAGE_ISD200
+UNUSUAL_DEV(  0x054c, 0x002b, 0x0100, 0x0110,
+               "Sony",
+               "Portable USB Harddrive V2",
+               US_SC_ISD200, US_PR_BULK, isd200_Initialization,
+               0 ),
+#endif
+
 UNUSUAL_DEV(  0x054c, 0x002d, 0x0100, 0x0100, 
                "Sony",
                "Memorystick MSAC-US1",
@@ -295,26 +303,6 @@ UNUSUAL_DEV(  0x059f, 0xa601, 0x0200, 0x0200,
                "USB Hard Disk",
                US_SC_RBC, US_PR_CB, NULL, 0 ), 
 
-/* This Pentax still camera is not conformant
- * to the USB storage specification: -
- * - It does not like the INQUIRY command. So we must handle this command
- *   of the SCSI layer ourselves.
- * Tested on Rev. 10.00 (0x1000)
- * Submitted by James Courtier-Dutton <James@superbug.demon.co.uk>
- */
-UNUSUAL_DEV( 0x0a17, 0x0004, 0x1000, 0x1000,
-                "Pentax",
-                "Optio 2/3/400",
-                US_SC_DEVICE, US_PR_DEVICE, NULL,
-                US_FL_FIX_INQUIRY ),
-
-/* Submitted by Per Winkvist <per.winkvist@uk.com> */
-UNUSUAL_DEV( 0x0a17, 0x006, 0x1000, 0x9009,
-                "Pentax",
-                "Optio S",
-                US_SC_8070, US_PR_CBI, NULL,
-                US_FL_FIX_INQUIRY ),
-
 #ifdef CONFIG_USB_STORAGE_ISD200
 UNUSUAL_DEV(  0x05ab, 0x0031, 0x0100, 0x0110,
                "In-System",
@@ -339,12 +327,6 @@ UNUSUAL_DEV(  0x05ab, 0x5701, 0x0100, 0x0110,
                "USB Storage Adapter V2",
                US_SC_ISD200, US_PR_BULK, isd200_Initialization,
                0 ),
-
-UNUSUAL_DEV(  0x054c, 0x002b, 0x0100, 0x0110,
-               "Sony",
-               "Portable USB Harddrive V2",
-               US_SC_ISD200, US_PR_BULK, isd200_Initialization,
-               0 ),
 #endif
 
 #ifdef CONFIG_USB_STORAGE_JUMPSHOT
@@ -385,12 +367,6 @@ UNUSUAL_DEV(  0x05e3, 0x0702, 0x0000, 0x0001,
                US_SC_DEVICE, US_PR_DEVICE, NULL,
                US_FL_FIX_INQUIRY ),
 
-UNUSUAL_DEV(  0x05e3, 0x0700, 0x0000, 0x9999,
-               "Unknown",
-               "GL641USB based CF Card reader",
-               US_SC_SCSI, US_PR_BULK, NULL,
-               US_FL_FIX_INQUIRY | US_FL_MODE_XLATE),
-
 /* Reported by Hanno Boeck <hanno@gmx.de>
  * Taken from the Lycoris Kernel */
 UNUSUAL_DEV(  0x0636, 0x0003, 0x0000, 0x9999,
@@ -520,13 +496,6 @@ UNUSUAL_DEV( 0x07c4, 0xa006, 0x0000, 0xffff,
                "Simple Tech/Datafab CF+SM Reader",
                US_SC_SCSI, US_PR_DATAFAB, NULL,
                US_FL_MODE_XLATE ),
-
-/* Submitted by Olaf Hering <olh@suse.de> */
-UNUSUAL_DEV(  0x07c4, 0xa109, 0x0000, 0xffff,
-               "Datafab Systems, Inc.",
-               "USB to CF + SM Combo (LC1)",
-               US_SC_SCSI, US_PR_DATAFAB, NULL,
-               US_FL_MODE_XLATE ),
 #endif
                
 #ifdef CONFIG_USB_STORAGE_SDDR55
@@ -538,6 +507,15 @@ UNUSUAL_DEV( 0x07c4, 0xa103, 0x0000, 0x9999,
                US_FL_FIX_INQUIRY ),
 #endif
 
+#ifdef CONFIG_USB_STORAGE_DATAFAB
+/* Submitted by Olaf Hering <olh@suse.de> */
+UNUSUAL_DEV(  0x07c4, 0xa109, 0x0000, 0xffff,
+               "Datafab Systems, Inc.",
+               "USB to CF + SM Combo (LC1)",
+               US_SC_SCSI, US_PR_DATAFAB, NULL,
+               US_FL_MODE_XLATE ),
+#endif
+
 /* Datafab KECF-USB / Sagatek DCS-CF / Simpletech Flashlink UCF-100
  * Only revision 1.13 tested (same for all of the above devices,
  * based on the Datafab DF-UG-07 chip).  Needed for US_FL_FIX_INQUIRY.
@@ -563,19 +541,28 @@ UNUSUAL_DEV( 0x07cf, 0x1001, 0x1000, 0x9009,
                US_SC_8070, US_PR_CB, NULL,
                US_FL_FIX_INQUIRY ),
 
+/* Submitted by Hartmut Wahl <hwahl@hwahl.de>*/
+UNUSUAL_DEV( 0x0839, 0x000a, 0x0001, 0x0001,
+               "Samsung",
+               "Digimax 410",
+               US_SC_DEVICE, US_PR_DEVICE, NULL,
+               US_FL_FIX_INQUIRY),
+
+/* Aiptek PocketCAM 3Mega
+ * Nicolas DUPEUX <nicolas@dupeux.net> 
+ */
+UNUSUAL_DEV(  0x08ca, 0x2011, 0x0000, 0x9999,
+               "AIPTEK",
+               "PocketCAM 3Mega",
+               US_SC_SCSI, US_PR_BULK, NULL,
+               US_FL_MODE_XLATE ),
+
 /* aeb */
 UNUSUAL_DEV( 0x090c, 0x1132, 0x0000, 0xffff,
                "Feiya",
                "5-in-1 Card Reader",
                US_SC_SCSI, US_PR_BULK, NULL,
                US_FL_FIX_CAPACITY ),
-
-/* Submitted by Hartmut Wahl <hwahl@hwahl.de>*/
-UNUSUAL_DEV( 0x0839, 0x000a, 0x0001, 0x0001,
-        "Samsung",
-        "Digimax 410",
-        US_SC_SCSI, US_PR_BULK, NULL,
-        US_FL_FIX_INQUIRY),
                 
 UNUSUAL_DEV(  0x097a, 0x0001, 0x0000, 0x0001,
                "Minds@Work",
@@ -589,11 +576,25 @@ UNUSUAL_DEV(  0x0a16, 0x8888, 0x0100, 0x0100,
                US_SC_SCSI, US_PR_BULK, NULL,
                US_FL_FIX_INQUIRY ),
 
-UNUSUAL_DEV(  0x0a16, 0x8888, 0x0100, 0x0100,
-               "IBM",
-               "IBM USB Memory Key",
-               US_SC_SCSI, US_PR_BULK, NULL,
-               US_FL_FIX_INQUIRY ),
+/* This Pentax still camera is not conformant
+ * to the USB storage specification: -
+ * - It does not like the INQUIRY command. So we must handle this command
+ *   of the SCSI layer ourselves.
+ * Tested on Rev. 10.00 (0x1000)
+ * Submitted by James Courtier-Dutton <James@superbug.demon.co.uk>
+ */
+UNUSUAL_DEV( 0x0a17, 0x0004, 0x1000, 0x1000,
+                "Pentax",
+                "Optio 2/3/400",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_FIX_INQUIRY ),
+
+/* Submitted by Per Winkvist <per.winkvist@uk.com> */
+UNUSUAL_DEV( 0x0a17, 0x006, 0x1000, 0x9009,
+                "Pentax",
+                "Optio S",
+                US_SC_8070, US_PR_CBI, NULL,
+                US_FL_FIX_INQUIRY ),
                
 #ifdef CONFIG_USB_STORAGE_ISD200
 UNUSUAL_DEV(  0x0bf6, 0xa001, 0x0100, 0x0110,
@@ -603,13 +604,6 @@ UNUSUAL_DEV(  0x0bf6, 0xa001, 0x0100, 0x0110,
                0 ),
 #endif
 
-/* EasyDisk support. Submitted by Stanislav Karchebny <berk@madfire.net> */
-UNUSUAL_DEV(  0x1065, 0x2136, 0x0000, 0x0001,
-               "Global Channel Solutions",
-               "EasyDisk EDxxxx",
-               US_SC_SCSI, US_PR_BULK, NULL,
-               US_FL_MODE_XLATE | US_FL_FIX_INQUIRY ),
-
 /* Reported by Kevin Cernekee <kpc-usbdev@gelato.uiuc.edu>
  * Tested on hardware version 1.10.
  * Entry is needed only for the initializer function override.
@@ -638,13 +632,3 @@ UNUSUAL_DEV(  0x55aa, 0xa103, 0x0000, 0x9999,
                US_SC_SCSI, US_PR_SDDR55, NULL,
                US_FL_SINGLE_LUN),
 #endif
-
-/* Aiptek PocketCAM 3Mega
- * Nicolas DUPEUX <nicolas@dupeux.net> 
- */
-UNUSUAL_DEV(  0x08ca, 0x2011, 0x0000, 0x9999,
-       "AIPTEK",
-       "PocketCAM 3Mega",
-       US_SC_SCSI, US_PR_BULK, NULL,
-       US_FL_MODE_XLATE ),
-