diff options
| author | Xose Vazquez Perez <xose.vazquez@gmail.com> | 2018-04-07 00:15:07 +0200 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2018-04-18 19:34:08 -0400 |
| commit | b15578ddaba437bf1a7bcc323069208bb92b5f86 (patch) | |
| tree | fc872f1fcaa6ae926ad54cb376186b8ff8a88276 | |
| parent | 40e4a2e15c563c5663df19fa40cb638c29203ed8 (diff) | |
| download | linux-b15578ddaba437bf1a7bcc323069208bb92b5f86.tar.gz linux-b15578ddaba437bf1a7bcc323069208bb92b5f86.tar.bz2 linux-b15578ddaba437bf1a7bcc323069208bb92b5f86.zip | |
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>
| -rw-r--r-- | drivers/scsi/scsi_devinfo.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c index dd107dc4db0e..e5c82f13b7d9 100644 --- a/drivers/scsi/scsi_devinfo.c +++ b/drivers/scsi/scsi_devinfo.c @@ -168,8 +168,7 @@ static struct { {"easyRAID", "F8", NULL, BLIST_NOREPORTLUN}, {"FSC", "CentricStor", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, {"Generic", "USB SD Reader", "1.00", BLIST_FORCELUN | BLIST_INQUIRY_36}, - {"Generic", "USB Storage-SMC", "0180", BLIST_FORCELUN | BLIST_INQUIRY_36}, - {"Generic", "USB Storage-SMC", "0207", BLIST_FORCELUN | BLIST_INQUIRY_36}, + {"Generic", "USB Storage-SMC", NULL, BLIST_FORCELUN | BLIST_INQUIRY_36}, /* FW: 0180 and 0207 */ {"HITACHI", "DF400", "*", BLIST_REPORTLUN2}, {"HITACHI", "DF500", "*", BLIST_REPORTLUN2}, {"HITACHI", "DISK-SUBSYSTEM", "*", BLIST_REPORTLUN2}, |