Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69fbdbb4 authored by Diego Elio Pettenò's avatar Diego Elio Pettenò Committed by Greg Kroah-Hartman
Browse files

scsi: sr: remove references to BLK_DEV_SR_VENDOR, leave it enabled 

[ Upstream commit 679b2ec8e060ca7a90441aff5e7d384720a41b76 ]

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: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarDiego Elio Pettenò <flameeyes@flameeyes.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 23a60941

arch/alpha/configs/defconfig

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ CONFIG_BLK_DEV_CY82C693=y 
CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_BLK_DEV_SR=y

CONFIG_BLK_DEV_SR_VENDOR=y

CONFIG_SCSI_AIC7XXX=m

CONFIG_AIC7XXX_CMDS_PER_DEVICE=253

# CONFIG_AIC7XXX_DEBUG_ENABLE is not set

arch/arm/configs/rpc_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ CONFIG_BLK_DEV_RAM=y 
CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

CONFIG_BLK_DEV_SR=y

CONFIG_BLK_DEV_SR_VENDOR=y

CONFIG_CHR_DEV_SG=y

CONFIG_SCSI_CONSTANTS=y

CONFIG_SCSI_LOGGING=y

arch/arm/configs/s3c2410_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -202,7 +202,6 @@ CONFIG_EEPROM_AT24=y 
CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

CONFIG_BLK_DEV_SR=y

CONFIG_BLK_DEV_SR_VENDOR=y

CONFIG_CHR_DEV_SG=y

CONFIG_CHR_DEV_SCH=m

CONFIG_SCSI_CONSTANTS=y

arch/ia64/configs/zx1_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ CONFIG_BLK_DEV_SD=y 
CONFIG_CHR_DEV_ST=y

CONFIG_CHR_DEV_OSST=y

CONFIG_BLK_DEV_SR=y

CONFIG_BLK_DEV_SR_VENDOR=y

CONFIG_CHR_DEV_SG=y

CONFIG_SCSI_CONSTANTS=y

CONFIG_SCSI_LOGGING=y

arch/m68k/configs/amiga_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -334,7 +334,6 @@ CONFIG_SCSI=y 
CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

CONFIG_BLK_DEV_SR=y

CONFIG_BLK_DEV_SR_VENDOR=y

CONFIG_CHR_DEV_SG=m

CONFIG_SCSI_CONSTANTS=y

CONFIG_SCSI_SAS_ATTRS=m