[PATCH] mpt3sas: add PCI dependency for CONFIG_SCSI_MPT2SAS

[PATCH] mpt3sas: add PCI dependency for CONFIG_SCSI_MPT2SAS

[Arnd Bergmann]

CONFIG_SCSI_MPT2SAS was added as a backwards-compatibility helper that
selects the replacement SCSI_MPT3SAS symbol, but lacks the dependencies:

warning: (SCSI_MPT2SAS) selects SCSI_MPT3SAS which has unmet direct dependencies (SCSI_LOWLEVEL && PCI && SCSI)
0x7E5F9A79 Fri Dec 4 12:36:08 CET 2015 failed
drivers/scsi/mpt3sas/mpt3sas_base.c: In function 'mpt3sas_remove_dead_ioc_func':
drivers/scsi/mpt3sas/mpt3sas_base.c:140:2: error: implicit declaration of function 'pci_stop_and_remove_bus_device_locked' [-Werror=implicit-function-declaration]
drivers/scsi/mpt3sas/mpt3sas_base.c: In function '_base_disable_msix':
drivers/scsi/mpt3sas/mpt3sas_base.c:1921:2: error: implicit declaration of function 'pci_disable_msix' [-Werror=implicit-function-declaration]

This adds the same dependencies that SCSI_MPT3SAS has.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: b840c3627b6f ("mpt3sas: Add dummy Kconfig option for backwards compatibility")
---
This appeared on today's linux-next with ARM randconfig builds

diff --git a/drivers/scsi/mpt3sas/Kconfig b/drivers/scsi/mpt3sas/Kconfig
index 25dc38f25ec6..33dc427cfe9a 100644
--- a/drivers/scsi/mpt3sas/Kconfig
+++ b/drivers/scsi/mpt3sas/Kconfig
@@ -74,6 +74,7 @@ config SCSI_MPT3SAS_MAX_SGE
 
 config SCSI_MPT2SAS
 	tristate "Legacy MPT2SAS config option"
+	depends on PCI && SCSI
 	default n
 	select SCSI_MPT3SAS
 	---help---

[PATCH] mpt3sas: add PCI dependency for CONFIG_SCSI_MPT2SAS

[James Bottomley]

On Fri, 2015-12-04 at 15:27 +0100, Arnd Bergmann wrote:
> CONFIG_SCSI_MPT2SAS was added as a backwards-compatibility helper that
> selects the replacement SCSI_MPT3SAS symbol, but lacks the dependencies:
> 
> warning: (SCSI_MPT2SAS) selects SCSI_MPT3SAS which has unmet direct dependencies (SCSI_LOWLEVEL && PCI && SCSI)
> 0x7E5F9A79 Fri Dec 4 12:36:08 CET 2015 failed
> drivers/scsi/mpt3sas/mpt3sas_base.c: In function 'mpt3sas_remove_dead_ioc_func':
> drivers/scsi/mpt3sas/mpt3sas_base.c:140:2: error: implicit declaration of function 'pci_stop_and_remove_bus_device_locked' [-Werror=implicit-function-declaration]
> drivers/scsi/mpt3sas/mpt3sas_base.c: In function '_base_disable_msix':
> drivers/scsi/mpt3sas/mpt3sas_base.c:1921:2: error: implicit declaration of function 'pci_disable_msix' [-Werror=implicit-function-declaration]
> 
> This adds the same dependencies that SCSI_MPT3SAS has.

OK, you're about the fifth person to complain about this and this patch
was posted a few days ago and is now here:

http://git.kernel.org/cgit/linux/kernel/git/jejb/scsi.git/commit/?h=fixes&id=3ddda3e4c82dea58933bde8d0f6ef34470c360cb

It's even been in for-next for nearly 24h

James

[PATCH] mpt3sas: add PCI dependency for CONFIG_SCSI_MPT2SAS

[Arnd Bergmann]

On Friday 04 December 2015 08:28:51 James Bottomley wrote:
> On Fri, 2015-12-04 at 15:27 +0100, Arnd Bergmann wrote:
> > CONFIG_SCSI_MPT2SAS was added as a backwards-compatibility helper that
> > selects the replacement SCSI_MPT3SAS symbol, but lacks the dependencies:
> > 
> > warning: (SCSI_MPT2SAS) selects SCSI_MPT3SAS which has unmet direct dependencies (SCSI_LOWLEVEL && PCI && SCSI)
> > 0x7E5F9A79 Fri Dec 4 12:36:08 CET 2015 failed
> > drivers/scsi/mpt3sas/mpt3sas_base.c: In function 'mpt3sas_remove_dead_ioc_func':
> > drivers/scsi/mpt3sas/mpt3sas_base.c:140:2: error: implicit declaration of function 'pci_stop_and_remove_bus_device_locked' [-Werror=implicit-function-declaration]
> > drivers/scsi/mpt3sas/mpt3sas_base.c: In function '_base_disable_msix':
> > drivers/scsi/mpt3sas/mpt3sas_base.c:1921:2: error: implicit declaration of function 'pci_disable_msix' [-Werror=implicit-function-declaration]
> > 
> > This adds the same dependencies that SCSI_MPT3SAS has.
> 
> OK, you're about the fifth person to complain about this and this patch
> was posted a few days ago and is now here:
> 
> http://git.kernel.org/cgit/linux/kernel/git/jejb/scsi.git/commit/?h=fixes&id=3ddda3e4c82dea58933bde8d0f6ef34470c360cb
> 
> It's even been in for-next for nearly 24h

I only found the bug on today on the latest linux-next, which should have
contained it if you pushed out the branch in time, but it's not in there.

2015-12-03 16:33:05 6e3ac04845fb "Merge branch 'fixes' into for-next"
2015-12-03 21:44:54 de84dfc24842 "Merge remote-tracking branch 'scsi/for-next'"

I'm sure it will be there in the next next.

	Arnd