From 59ce8d558c0e2d0217d2aab938c8334a896c02ee Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sat, 21 Feb 2015 13:16:34 +0100 Subject: [PATCH] staging: unisys: Rework Kconfig dependencies I find the Kconfig dependencies of the various Unisys drivers rather confusing. Due to the dependencies, you must select the drivers one by one to see the following ones. So if you are looking for a specific driver, it is not visible by default. And if you don't know exactly what you need, it's even worse as you don't know what is available. In a case like this with several helper drivers and many dependencies, I think it makes more sense to list all the drivers at first, and use select statements to fulfill the dependencies for the user. As a nice side effect, it avoids the weird indentation, which was technically correct but still somewhat confusing. I also dropped the dependencies on HAS_IOMEM, as the whole driver set is for X86_64 only anyway which always has HAS_IOMEM set. And I dropped the redundant dependencies on UNISYSSPAR as all drivers are already inside an "if UNISYSSPAR" block. Signed-off-by: Jean Delvare Cc: Benjamin Romer Cc: David Kershner Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- drivers/staging/unisys/uislib/Kconfig | 2 +- drivers/staging/unisys/virthba/Kconfig | 5 ++++- drivers/staging/unisys/virtpci/Kconfig | 2 +- drivers/staging/unisys/visorchannel/Kconfig | 2 +- drivers/staging/unisys/visorchipset/Kconfig | 3 ++- drivers/staging/unisys/visorutil/Kconfig | 1 - 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/staging/unisys/uislib/Kconfig b/drivers/staging/unisys/uislib/Kconfig index a712eb8..c39a0a2 100644 --- a/drivers/staging/unisys/uislib/Kconfig +++ b/drivers/staging/unisys/uislib/Kconfig @@ -4,7 +4,7 @@ config UNISYS_UISLIB tristate "Unisys uislib driver" - depends on UNISYSSPAR && UNISYS_VISORCHIPSET && HAS_IOMEM + select UNISYS_VISORCHIPSET ---help--- If you say Y here, you will enable the Unisys uislib driver. diff --git a/drivers/staging/unisys/virthba/Kconfig b/drivers/staging/unisys/virthba/Kconfig index 9af98fc..dfadfc4 100644 --- a/drivers/staging/unisys/virthba/Kconfig +++ b/drivers/staging/unisys/virthba/Kconfig @@ -4,7 +4,10 @@ config UNISYS_VIRTHBA tristate "Unisys virthba driver" - depends on UNISYSSPAR && UNISYS_VISORCHIPSET && UNISYS_UISLIB && UNISYS_VIRTPCI && SCSI + depends on SCSI + select UNISYS_VISORCHIPSET + select UNISYS_UISLIB + select UNISYS_VIRTPCI ---help--- If you say Y here, you will enable the Unisys virthba driver. diff --git a/drivers/staging/unisys/virtpci/Kconfig b/drivers/staging/unisys/virtpci/Kconfig index e59efcb..6d19482 100644 --- a/drivers/staging/unisys/virtpci/Kconfig +++ b/drivers/staging/unisys/virtpci/Kconfig @@ -4,7 +4,7 @@ config UNISYS_VIRTPCI tristate "Unisys virtpci driver" - depends on UNISYSSPAR && UNISYS_UISLIB + select UNISYS_UISLIB ---help--- If you say Y here, you will enable the Unisys virtpci driver. diff --git a/drivers/staging/unisys/visorchannel/Kconfig b/drivers/staging/unisys/visorchannel/Kconfig index 41c3b4b..8d31beb 100644 --- a/drivers/staging/unisys/visorchannel/Kconfig +++ b/drivers/staging/unisys/visorchannel/Kconfig @@ -4,7 +4,7 @@ config UNISYS_VISORCHANNEL tristate "Unisys visorchannel driver" - depends on UNISYSSPAR && UNISYS_VISORUTIL + select UNISYS_VISORUTIL ---help--- If you say Y here, you will enable the Unisys visorchannel driver. diff --git a/drivers/staging/unisys/visorchipset/Kconfig b/drivers/staging/unisys/visorchipset/Kconfig index e86836f..b03bfc5 100644 --- a/drivers/staging/unisys/visorchipset/Kconfig +++ b/drivers/staging/unisys/visorchipset/Kconfig @@ -4,7 +4,8 @@ config UNISYS_VISORCHIPSET tristate "Unisys visorchipset driver" - depends on UNISYSSPAR && UNISYS_VISORUTIL && UNISYS_VISORCHANNEL && HAS_IOMEM + select UNISYS_VISORUTIL + select UNISYS_VISORCHANNEL ---help--- If you say Y here, you will enable the Unisys visorchipset driver. diff --git a/drivers/staging/unisys/visorutil/Kconfig b/drivers/staging/unisys/visorutil/Kconfig index 74b474e..be9c2cf 100644 --- a/drivers/staging/unisys/visorutil/Kconfig +++ b/drivers/staging/unisys/visorutil/Kconfig @@ -4,7 +4,6 @@ config UNISYS_VISORUTIL tristate "Unisys visorutil driver" - depends on UNISYSSPAR && HAS_IOMEM ---help--- If you say Y here, you will enable the Unisys visorutil driver. -- 2.7.4