tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

scsi: devinfo: delete duplicate "Generic"/"USB Storage-SMC" device

The revision field is currently unused by the devinfo pattern matching
code. Combine two blacklist entries into one.

$ egrep "Generic.*Storage-SMC" /proc/scsi/device_info
'Generic' 'USB Storage-SMC' 0x402
'Generic' 'USB Storage-SMC' 0x402

[mkp: tweaked commit desc]

Cc: Hannes Reinecke <hare@suse.de>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: James E.J. Bottomley <jejb@linux.vnet.ibm.com>
Cc: SCSI ML <linux-scsi@vger.kernel.org>
Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Xose Vazquez Perez and committed by
Martin K. Petersen b15578dd 40e4a2e1

+1 -2
+1 -2
drivers/scsi/scsi_devinfo.c
··· 168 168 {"easyRAID", "F8", NULL, BLIST_NOREPORTLUN}, 169 169 {"FSC", "CentricStor", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, 170 170 {"Generic", "USB SD Reader", "1.00", BLIST_FORCELUN | BLIST_INQUIRY_36}, 171 - {"Generic", "USB Storage-SMC", "0180", BLIST_FORCELUN | BLIST_INQUIRY_36}, 172 - {"Generic", "USB Storage-SMC", "0207", BLIST_FORCELUN | BLIST_INQUIRY_36}, 171 + {"Generic", "USB Storage-SMC", NULL, BLIST_FORCELUN | BLIST_INQUIRY_36}, /* FW: 0180 and 0207 */ 173 172 {"HITACHI", "DF400", "*", BLIST_REPORTLUN2}, 174 173 {"HITACHI", "DF500", "*", BLIST_REPORTLUN2}, 175 174 {"HITACHI", "DISK-SUBSYSTEM", "*", BLIST_REPORTLUN2},