Commit c309b351 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Christoph Hellwig
Browse files

scsi: Remove CONFIG_SCSI_MULTI_LUN 



Obsolete; either use 'max_lun' if the host supports only a
limited number of LUNs or BLIST_NOLUN if the target has
problems addressing more than one LUN.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarEwan Milne <emilne@redhat.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent cc833acb

Documentation/scsi/tmscsim.txt

+0 −2
Original line number Diff line number Diff line
@@ -317,8 +317,6 @@ Each of the parameters is a number, containing the described information: 
    4	 0x10	   16	  Immediate return on BIOS seek command. (Not used)

 (*)5	 0x20	   32	  Check for LUNs >= 1.

  

  The default for LUN Check depends on CONFIG_SCSI_MULTI_LUN.



* TaggedCmnds is a number indicating the maximum number of Tagged Commands.

  It is the binary logarithm - 1 of the actual number. Max is 4 (32).

   Value  Number of Tagged Commands

drivers/scsi/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -197,20 +197,6 @@ config SCSI_ENCLOSURE 
	  it has an enclosure device.  Selecting this option will just allow

	  certain enclosure conditions to be reported and is not required.



config SCSI_MULTI_LUN

	bool "Probe all LUNs on each SCSI device"

	depends on SCSI

	help

	  Some devices support more than one LUN (Logical Unit Number) in order

	  to allow access to several media, e.g. CD jukebox, USB card reader,

	  mobile phone in mass storage mode. This option forces the kernel to

	  probe for all LUNs by default. This setting can be overridden by

	  max_luns boot/module parameter. Note that this option does not affect

	  devices conforming to SCSI-3 or higher as they can explicitly report

	  their number of LUNs. It is safe to say Y here unless you have one of

	  those rare devices which reacts in an unexpected way when probed for

	  multiple LUNs.



config SCSI_CONSTANTS

	bool "Verbose SCSI error reporting (kernel size +=12K)"

	depends on SCSI

drivers/scsi/dc395x.c

+1 −8
Original line number Diff line number Diff line
@@ -519,9 +519,7 @@ static struct ParameterData cfg_data[] = { 
		CFG_PARAM_UNSET,

		0,

		0x2f,

#ifdef CONFIG_SCSI_MULTI_LUN

		NAC_SCANLUN |

#endif

		NAC_GT2DRIVES | NAC_GREATER_1G | NAC_POWERON_SCSI_RESET

			/*| NAC_ACTIVE_NEG*/,

		NAC_GT2DRIVES | NAC_GREATER_1G | NAC_POWERON_SCSI_RESET | 0x08
@@ -4434,15 +4432,10 @@ static void adapter_init_scsi_host(struct Scsi_Host *host) 
	if (host->max_id - 1 == eeprom->scsi_id)

		host->max_id--;



#ifdef CONFIG_SCSI_MULTI_LUN

	if (eeprom->channel_cfg & NAC_SCANLUN)

		host->max_lun = 8;

	else

		host->max_lun = 1;

#else

	host->max_lun = 1;

#endif



}

drivers/scsi/ncr53c8xx.h

+0 −4
Original line number Diff line number Diff line
@@ -264,11 +264,7 @@ 
#define SCSI_NCR_SG_TABLESIZE	(SCSI_NCR_MAX_SCATTER)

#define SCSI_NCR_TIMER_INTERVAL	(HZ)



#if 1 /* defined CONFIG_SCSI_MULTI_LUN */

#define SCSI_NCR_MAX_LUN	(16)

#else

#define SCSI_NCR_MAX_LUN	(1)

#endif



/*

 *  IO functions definition for big/little endian CPU support.

drivers/scsi/scsi_scan.c

+0 −4
Original line number Diff line number Diff line
@@ -81,11 +81,7 @@ static const char *scsi_null_device_strs = "nullnullnullnull"; 


#define MAX_SCSI_LUNS	512



#ifdef CONFIG_SCSI_MULTI_LUN

static unsigned int max_scsi_luns = MAX_SCSI_LUNS;

#else

static unsigned int max_scsi_luns = 1;

#endif



module_param_named(max_luns, max_scsi_luns, uint, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(max_luns,