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

Commit 6a38792c authored by Randy Dunlap's avatar Randy Dunlap Committed by David S. Miller
Browse files

scsi: use 'depends' instead of 'select' for SCSI_FC_ATTRS 



There are other kconfig symbols which use SCSI_FC_ATTRS.
In order to maintain sanity and prevent kconfig warnings, change
all of these from using 'select' to using 'depends on' so that
proper symbol dependencies will be honored and circular depends
problems will be avoided.
This fixes kconfig warnings and build errors:

warning: (LIBFC && SCSI_IBMVFC && SCSI_QLA_FC && SCSI_LPFC && ZFCP && SCSI_BFA_FC && SCSI_CHELSIO_FCOE && FUSION_FC) selects SCSI_FC_ATTRS which has unmet direct dependencies (SCSI && NET)
drivers/scsi/scsi_transport_fc.c: In function 'fc_host_post_event':
drivers/scsi/scsi_transport_fc.c:543:7: error: 'scsi_nl_sock' undeclared (first use in this function)
drivers/scsi/scsi_transport_fc.c: In function 'fc_host_post_vendor_event':
drivers/scsi/scsi_transport_fc.c:611:7: error: 'scsi_nl_sock' undeclared (first use in this function)

Reported-by: Fengguang Wu <fengguang.wu@intel.com> [0-day test robot]
Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f650fb45

drivers/message/fusion/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ config FUSION_SPI 
config FUSION_FC

	tristate "Fusion MPT ScsiHost drivers for FC"

	depends on PCI && SCSI

	select SCSI_FC_ATTRS

	depends on SCSI_FC_ATTRS

	---help---

	  SCSI HOST support for a Fiber Channel host adapters.

drivers/scsi/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ config HYPERV_STORAGE 


config LIBFC

	tristate "LibFC module"

	select SCSI_FC_ATTRS

	depends on SCSI_FC_ATTRS

	select CRC32

	---help---

	  Fibre Channel library module
@@ -816,7 +816,7 @@ config SCSI_IBMVSCSI 
config SCSI_IBMVFC

	tristate "IBM Virtual FC support"

	depends on PPC_PSERIES && SCSI

	select SCSI_FC_ATTRS

	depends on SCSI_FC_ATTRS

	help

	  This is the IBM POWER Virtual FC Client
@@ -1266,7 +1266,7 @@ source "drivers/scsi/qla4xxx/Kconfig" 
config SCSI_LPFC

	tristate "Emulex LightPulse Fibre Channel Support"

	depends on PCI && SCSI

	select SCSI_FC_ATTRS

	depends on SCSI_FC_ATTRS

	select CRC_T10DIF

	help

          This lpfc driver supports the Emulex LightPulse
@@ -1676,7 +1676,7 @@ config SCSI_SUNESP 
config ZFCP

	tristate "FCP host bus adapter driver for IBM eServer zSeries"

	depends on S390 && QDIO && SCSI

	select SCSI_FC_ATTRS

	depends on SCSI_FC_ATTRS

	help

          If you want to access SCSI devices attached to your IBM eServer

          zSeries by means of Fibre Channel interfaces say Y.
@@ -1704,7 +1704,7 @@ config SCSI_PM8001 
config SCSI_BFA_FC

	tristate "Brocade BFA Fibre Channel Support"

	depends on PCI && SCSI

	select SCSI_FC_ATTRS

	depends on SCSI_FC_ATTRS

	help

	  This bfa driver supports all Brocade PCIe FC/FCOE host adapters.

drivers/scsi/csiostor/Kconfig

+1 −1
Original line number Diff line number Diff line 
config SCSI_CHELSIO_FCOE

	tristate "Chelsio Communications FCoE support"

	depends on PCI && SCSI

	select SCSI_FC_ATTRS

	depends on SCSI_FC_ATTRS

	select FW_LOADER

	help

	  This driver supports FCoE Offload functionality over

drivers/scsi/qla2xxx/Kconfig

+1 −1
Original line number Diff line number Diff line 
config SCSI_QLA_FC

	tristate "QLogic QLA2XXX Fibre Channel Support"

	depends on PCI && SCSI

	select SCSI_FC_ATTRS

	depends on SCSI_FC_ATTRS

	select FW_LOADER

	---help---

	This qla2xxx driver supports all QLogic Fibre Channel