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

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
...@@ -29,7 +29,7 @@ config FUSION_SPI ...@@ -29,7 +29,7 @@ config FUSION_SPI
config FUSION_FC config FUSION_FC
tristate "Fusion MPT ScsiHost drivers for FC" tristate "Fusion MPT ScsiHost drivers for FC"
depends on PCI && SCSI depends on PCI && SCSI
select SCSI_FC_ATTRS depends on SCSI_FC_ATTRS
---help--- ---help---
SCSI HOST support for a Fiber Channel host adapters. SCSI HOST support for a Fiber Channel host adapters.
......
...@@ -585,7 +585,7 @@ config HYPERV_STORAGE ...@@ -585,7 +585,7 @@ config HYPERV_STORAGE
config LIBFC config LIBFC
tristate "LibFC module" tristate "LibFC module"
select SCSI_FC_ATTRS depends on SCSI_FC_ATTRS
select CRC32 select CRC32
---help--- ---help---
Fibre Channel library module Fibre Channel library module
...@@ -816,7 +816,7 @@ config SCSI_IBMVSCSI ...@@ -816,7 +816,7 @@ config SCSI_IBMVSCSI
config SCSI_IBMVFC config SCSI_IBMVFC
tristate "IBM Virtual FC support" tristate "IBM Virtual FC support"
depends on PPC_PSERIES && SCSI depends on PPC_PSERIES && SCSI
select SCSI_FC_ATTRS depends on SCSI_FC_ATTRS
help help
This is the IBM POWER Virtual FC Client This is the IBM POWER Virtual FC Client
...@@ -1266,7 +1266,7 @@ source "drivers/scsi/qla4xxx/Kconfig" ...@@ -1266,7 +1266,7 @@ source "drivers/scsi/qla4xxx/Kconfig"
config SCSI_LPFC config SCSI_LPFC
tristate "Emulex LightPulse Fibre Channel Support" tristate "Emulex LightPulse Fibre Channel Support"
depends on PCI && SCSI depends on PCI && SCSI
select SCSI_FC_ATTRS depends on SCSI_FC_ATTRS
select CRC_T10DIF select CRC_T10DIF
help help
This lpfc driver supports the Emulex LightPulse This lpfc driver supports the Emulex LightPulse
...@@ -1676,7 +1676,7 @@ config SCSI_SUNESP ...@@ -1676,7 +1676,7 @@ config SCSI_SUNESP
config ZFCP config ZFCP
tristate "FCP host bus adapter driver for IBM eServer zSeries" tristate "FCP host bus adapter driver for IBM eServer zSeries"
depends on S390 && QDIO && SCSI depends on S390 && QDIO && SCSI
select SCSI_FC_ATTRS depends on SCSI_FC_ATTRS
help help
If you want to access SCSI devices attached to your IBM eServer If you want to access SCSI devices attached to your IBM eServer
zSeries by means of Fibre Channel interfaces say Y. zSeries by means of Fibre Channel interfaces say Y.
...@@ -1704,7 +1704,7 @@ config SCSI_PM8001 ...@@ -1704,7 +1704,7 @@ config SCSI_PM8001
config SCSI_BFA_FC config SCSI_BFA_FC
tristate "Brocade BFA Fibre Channel Support" tristate "Brocade BFA Fibre Channel Support"
depends on PCI && SCSI depends on PCI && SCSI
select SCSI_FC_ATTRS depends on SCSI_FC_ATTRS
help help
This bfa driver supports all Brocade PCIe FC/FCOE host adapters. This bfa driver supports all Brocade PCIe FC/FCOE host adapters.
......
config SCSI_CHELSIO_FCOE config SCSI_CHELSIO_FCOE
tristate "Chelsio Communications FCoE support" tristate "Chelsio Communications FCoE support"
depends on PCI && SCSI depends on PCI && SCSI
select SCSI_FC_ATTRS depends on SCSI_FC_ATTRS
select FW_LOADER select FW_LOADER
help help
This driver supports FCoE Offload functionality over This driver supports FCoE Offload functionality over
......
config SCSI_QLA_FC config SCSI_QLA_FC
tristate "QLogic QLA2XXX Fibre Channel Support" tristate "QLogic QLA2XXX Fibre Channel Support"
depends on PCI && SCSI depends on PCI && SCSI
select SCSI_FC_ATTRS depends on SCSI_FC_ATTRS
select FW_LOADER select FW_LOADER
---help--- ---help---
This qla2xxx driver supports all QLogic Fibre Channel This qla2xxx driver supports all QLogic Fibre Channel
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment