[v5,09/11] mmc: sdhci-acpi: Make PCI dependency explicit
diff mbox series

Message ID 20190102181038.4418-10-okaya@kernel.org
State New
Headers show
Series
  • Untitled series #61639
Related show

Commit Message

Sinan Kaya Jan. 2, 2019, 6:10 p.m. UTC
After 'commit 5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without
CONFIG_PCI set")' dependencies on CONFIG_PCI that previously were
satisfied implicitly through dependencies on CONFIG_ACPI have to be
specified directly. This driver relies on IOSF_MBI and IOSF_MBI depends
on PCI. For this reason, add a direct dependency to CONFIG_PCI here.

Fixes: 5d32a66541c46 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")
Signed-off-by: Sinan Kaya <okaya@kernel.org>
---
 drivers/mmc/host/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Hunter, Adrian Jan. 3, 2019, 2:49 p.m. UTC | #1
On 2/01/19 8:10 PM, Sinan Kaya wrote:
> After 'commit 5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without
> CONFIG_PCI set")' dependencies on CONFIG_PCI that previously were
> satisfied implicitly through dependencies on CONFIG_ACPI have to be
> specified directly. This driver relies on IOSF_MBI and IOSF_MBI depends
> on PCI. For this reason, add a direct dependency to CONFIG_PCI here.

This driver does not rely on IOSF_MBI

You wrote on the other email QCOM doesn't use PCI but here you are making
them depend on it.  Please explain.

> 
> Fixes: 5d32a66541c46 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")
> Signed-off-by: Sinan Kaya <okaya@kernel.org>
> ---
>  drivers/mmc/host/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index e26b8145efb3..1b9401fe94c0 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -116,7 +116,7 @@ config MMC_RICOH_MMC
>  
>  config MMC_SDHCI_ACPI
>  	tristate "SDHCI support for ACPI enumerated SDHCI controllers"
> -	depends on MMC_SDHCI && ACPI
> +	depends on MMC_SDHCI && ACPI && PCI
>  	select IOSF_MBI if X86
>  	help
>  	  This selects support for ACPI enumerated SDHCI controllers,
>
Sinan Kaya Jan. 3, 2019, 2:57 p.m. UTC | #2
On Thu, Jan 3, 2019 at 2:50 PM Adrian Hunter <adrian.hunter@intel.com> wrote:
>
> On 2/01/19 8:10 PM, Sinan Kaya wrote:
> > After 'commit 5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without
> > CONFIG_PCI set")' dependencies on CONFIG_PCI that previously were
> > satisfied implicitly through dependencies on CONFIG_ACPI have to be
> > specified directly. This driver relies on IOSF_MBI and IOSF_MBI depends
> > on PCI. For this reason, add a direct dependency to CONFIG_PCI here.
>
> This driver does not rely on IOSF_MBI
>

X86 version does.

select IOSF_MBI if X86


> You wrote on the other email QCOM doesn't use PCI but here you are making
> them depend on it.  Please explain.
>

I matched the behavior before my change. This code wouldn't be
available without PCI and ACPI on previous kernel versions and left
kconfig cleanup as another exercise for some other day.

> >
> > Fixes: 5d32a66541c46 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")
> > Signed-off-by: Sinan Kaya <okaya@kernel.org>
> > ---
> >  drivers/mmc/host/Kconfig | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> > index e26b8145efb3..1b9401fe94c0 100644
> > --- a/drivers/mmc/host/Kconfig
> > +++ b/drivers/mmc/host/Kconfig
> > @@ -116,7 +116,7 @@ config MMC_RICOH_MMC
> >
> >  config MMC_SDHCI_ACPI
> >       tristate "SDHCI support for ACPI enumerated SDHCI controllers"
> > -     depends on MMC_SDHCI && ACPI
> > +     depends on MMC_SDHCI && ACPI && PCI
> >       select IOSF_MBI if X86
> >       help
> >         This selects support for ACPI enumerated SDHCI controllers,
> >
>

Patch
diff mbox series

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index e26b8145efb3..1b9401fe94c0 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -116,7 +116,7 @@  config MMC_RICOH_MMC
 
 config MMC_SDHCI_ACPI
 	tristate "SDHCI support for ACPI enumerated SDHCI controllers"
-	depends on MMC_SDHCI && ACPI
+	depends on MMC_SDHCI && ACPI && PCI
 	select IOSF_MBI if X86
 	help
 	  This selects support for ACPI enumerated SDHCI controllers,