scsi: sr: remove references to BLK_DEV_SR_VENDOR, leave it enabled
This kernel configuration is basically enabling/disabling sr driver quirks detection. While these quirks are for fairly rare devices (very old CD burners, and a glucometer), the additional detection of these models is a very minimal amount of code. The logic behind the quirks is always built into the sr driver. This also removes the config from all the defconfig files that are enabling this already. Link: https://lore.kernel.org/r/20200223191144.726-1-flameeyes@flameeyes.com Reviewed-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:

committed by
Martin K. Petersen

parent
30f6d494cc
commit
679b2ec8e0
@@ -67,9 +67,6 @@
|
||||
|
||||
void sr_vendor_init(Scsi_CD *cd)
|
||||
{
|
||||
#ifndef CONFIG_BLK_DEV_SR_VENDOR
|
||||
cd->vendor = VENDOR_SCSI3;
|
||||
#else
|
||||
const char *vendor = cd->device->vendor;
|
||||
const char *model = cd->device->model;
|
||||
|
||||
@@ -118,7 +115,6 @@ void sr_vendor_init(Scsi_CD *cd)
|
||||
CDC_PLAY_AUDIO
|
||||
);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -132,10 +128,8 @@ int sr_set_blocklength(Scsi_CD *cd, int blocklength)
|
||||
struct ccs_modesel_head *modesel;
|
||||
int rc, density = 0;
|
||||
|
||||
#ifdef CONFIG_BLK_DEV_SR_VENDOR
|
||||
if (cd->vendor == VENDOR_TOSHIBA)
|
||||
density = (blocklength > 2048) ? 0x81 : 0x83;
|
||||
#endif
|
||||
|
||||
buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
|
||||
if (!buffer)
|
||||
@@ -223,7 +217,6 @@ int sr_cd_check(struct cdrom_device_info *cdi)
|
||||
}
|
||||
break;
|
||||
|
||||
#ifdef CONFIG_BLK_DEV_SR_VENDOR
|
||||
case VENDOR_NEC:{
|
||||
unsigned long min, sec, frame;
|
||||
cgc.cmd[0] = 0xde;
|
||||
@@ -316,7 +309,6 @@ int sr_cd_check(struct cdrom_device_info *cdi)
|
||||
sector = buffer[11] + (buffer[10] << 8) +
|
||||
(buffer[9] << 16) + (buffer[8] << 24);
|
||||
break;
|
||||
#endif /* CONFIG_BLK_DEV_SR_VENDOR */
|
||||
|
||||
default:
|
||||
/* should not happen */
|
||||
|
Reference in New Issue
Block a user