Преглед изворни кода

isci: remove compile-time (Kconfig) silicon configuration

Pre-production silicon support is deprecated, and will be removed
completely in the future.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Dan Williams пре 14 година
родитељ
комит
c6d4225789
2 измењених фајлова са 1 додато и 25 уклоњено
  1. 0 18
      drivers/scsi/Kconfig
  2. 1 7
      drivers/scsi/isci/init.c

+ 0 - 18
drivers/scsi/Kconfig

@@ -843,24 +843,6 @@ config SCSI_ISCI
 
 	  The experimental tag will be removed after the driver exits alpha
 
-choice
-	prompt "Default Silicon Revision"
-	depends on SCSI_ISCI
-	default PBG_HBA_A2
-	# temporary A-step silicon is pre-production
-
-config PBG_HBA_BETA
-	bool "B0"
-
-config PBG_HBA_A2
-	bool "A2"
-
-config PBG_HBA_A0
-	bool "A0"
-
-endchoice
-
-
 config SCSI_GENERIC_NCR5380
 	tristate "Generic NCR5380/53c400 SCSI PIO support"
 	depends on ISA && SCSI

+ 1 - 7
drivers/scsi/isci/init.c

@@ -87,15 +87,9 @@ MODULE_DEVICE_TABLE(pci, isci_id_table);
 
 /* linux isci specific settings */
 
-#if defined(CONFIG_PBG_HBA_A0)
-int isci_si_rev = ISCI_SI_REVA0;
-#elif defined(CONFIG_PBG_HBA_A2)
 int isci_si_rev = ISCI_SI_REVA2;
-#else
-int isci_si_rev = ISCI_SI_REVB0;
-#endif
 module_param(isci_si_rev, int, 0);
-MODULE_PARM_DESC(isci_si_rev, "override default si rev (0: A0 1: A2 2: B0)");
+MODULE_PARM_DESC(isci_si_rev, "(deprecated) override default si rev (0: A0 1: A2 2: B0)");
 
 unsigned char no_outbound_task_to = 20;
 module_param(no_outbound_task_to, byte, 0);