| Message ID | 1523987360-18760-14-git-send-email-geert@linux-m68k.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 17 April 2018 at 19:49, Geert Uytterhoeven <geert@linux-m68k.org> wrote: > Remove dependencies on HAS_DMA where a Kconfig symbol depends on another > symbol that implies HAS_DMA, and, optionally, on "|| COMPILE_TEST". > In most cases this other symbol is an architecture or platform specific > symbol, or PCI. > > Generic symbols and drivers without platform dependencies keep their > dependencies on HAS_DMA, to prevent compiling subsystems or drivers that > cannot work anyway. > > This simplifies the dependencies, and allows to improve compile-testing. > > Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> > Reviewed-by: Mark Brown <broonie@kernel.org> > Acked-by: Robin Murphy <robin.murphy@arm.com> > Acked-by: Ulf Hansson <ulf.hansson@linaro.org> Thanks, applied for next! Kind regrds Uffe > --- > v3: > - Add Acked-by, > - Rebase to v4.17-rc1, > > v2: > - Add Reviewed-by, Acked-by, > - Drop RFC state, > - Split per subsystem. > --- > drivers/mmc/host/Kconfig | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig > index 9589f9c9046f14b1..3978d0418958bf6b 100644 > --- a/drivers/mmc/host/Kconfig > +++ b/drivers/mmc/host/Kconfig > @@ -358,7 +358,6 @@ config MMC_MESON_MX_SDIO > tristate "Amlogic Meson6/Meson8/Meson8b SD/MMC Host Controller support" > depends on ARCH_MESON || COMPILE_TEST > depends on COMMON_CLK > - depends on HAS_DMA > depends on OF > help > This selects support for the SD/MMC Host Controller on > @@ -401,7 +400,6 @@ config MMC_OMAP > > config MMC_OMAP_HS > tristate "TI OMAP High Speed Multimedia Card Interface support" > - depends on HAS_DMA > depends on ARCH_OMAP2PLUS || ARCH_KEYSTONE || COMPILE_TEST > help > This selects the TI OMAP High Speed Multimedia card Interface. > @@ -511,7 +509,6 @@ config MMC_DAVINCI > > config MMC_GOLDFISH > tristate "goldfish qemu Multimedia Card Interface support" > - depends on HAS_DMA > depends on GOLDFISH || COMPILE_TEST > help > This selects the Goldfish Multimedia card Interface emulation > @@ -605,7 +602,7 @@ config MMC_SDHI > > config MMC_SDHI_SYS_DMAC > tristate "DMA for SDHI SD/SDIO controllers using SYS-DMAC" > - depends on MMC_SDHI && HAS_DMA > + depends on MMC_SDHI > default MMC_SDHI if (SUPERH || ARM) > help > This provides DMA support for SDHI SD/SDIO controllers > @@ -615,7 +612,7 @@ config MMC_SDHI_SYS_DMAC > config MMC_SDHI_INTERNAL_DMAC > tristate "DMA for SDHI SD/SDIO controllers using on-chip bus mastering" > depends on ARM64 || COMPILE_TEST > - depends on MMC_SDHI && HAS_DMA > + depends on MMC_SDHI > default MMC_SDHI if ARM64 > help > This provides DMA support for SDHI SD/SDIO controllers > @@ -669,7 +666,6 @@ config MMC_CAVIUM_THUNDERX > > config MMC_DW > tristate "Synopsys DesignWare Memory Card Interface" > - depends on HAS_DMA > depends on ARC || ARM || ARM64 || MIPS || COMPILE_TEST > help > This selects support for the Synopsys DesignWare Mobile Storage IP > @@ -748,7 +744,6 @@ config MMC_DW_ZX > > config MMC_SH_MMCIF > tristate "SuperH Internal MMCIF support" > - depends on HAS_DMA > depends on SUPERH || ARCH_RENESAS || COMPILE_TEST > help > This selects the MMC Host Interface controller (MMCIF) found in various > @@ -868,7 +863,6 @@ config MMC_TOSHIBA_PCI > config MMC_BCM2835 > tristate "Broadcom BCM2835 SDHOST MMC Controller support" > depends on ARCH_BCM2835 || COMPILE_TEST > - depends on HAS_DMA > help > This selects the BCM2835 SDHOST MMC controller. If you have > a BCM2835 platform with SD or MMC devices, say Y or M here. > -- > 2.7.4 >
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 9589f9c9046f14b1..3978d0418958bf6b 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -358,7 +358,6 @@ config MMC_MESON_MX_SDIO tristate "Amlogic Meson6/Meson8/Meson8b SD/MMC Host Controller support" depends on ARCH_MESON || COMPILE_TEST depends on COMMON_CLK - depends on HAS_DMA depends on OF help This selects support for the SD/MMC Host Controller on @@ -401,7 +400,6 @@ config MMC_OMAP config MMC_OMAP_HS tristate "TI OMAP High Speed Multimedia Card Interface support" - depends on HAS_DMA depends on ARCH_OMAP2PLUS || ARCH_KEYSTONE || COMPILE_TEST help This selects the TI OMAP High Speed Multimedia card Interface. @@ -511,7 +509,6 @@ config MMC_DAVINCI config MMC_GOLDFISH tristate "goldfish qemu Multimedia Card Interface support" - depends on HAS_DMA depends on GOLDFISH || COMPILE_TEST help This selects the Goldfish Multimedia card Interface emulation @@ -605,7 +602,7 @@ config MMC_SDHI config MMC_SDHI_SYS_DMAC tristate "DMA for SDHI SD/SDIO controllers using SYS-DMAC" - depends on MMC_SDHI && HAS_DMA + depends on MMC_SDHI default MMC_SDHI if (SUPERH || ARM) help This provides DMA support for SDHI SD/SDIO controllers @@ -615,7 +612,7 @@ config MMC_SDHI_SYS_DMAC config MMC_SDHI_INTERNAL_DMAC tristate "DMA for SDHI SD/SDIO controllers using on-chip bus mastering" depends on ARM64 || COMPILE_TEST - depends on MMC_SDHI && HAS_DMA + depends on MMC_SDHI default MMC_SDHI if ARM64 help This provides DMA support for SDHI SD/SDIO controllers @@ -669,7 +666,6 @@ config MMC_CAVIUM_THUNDERX config MMC_DW tristate "Synopsys DesignWare Memory Card Interface" - depends on HAS_DMA depends on ARC || ARM || ARM64 || MIPS || COMPILE_TEST help This selects support for the Synopsys DesignWare Mobile Storage IP @@ -748,7 +744,6 @@ config MMC_DW_ZX config MMC_SH_MMCIF tristate "SuperH Internal MMCIF support" - depends on HAS_DMA depends on SUPERH || ARCH_RENESAS || COMPILE_TEST help This selects the MMC Host Interface controller (MMCIF) found in various @@ -868,7 +863,6 @@ config MMC_TOSHIBA_PCI config MMC_BCM2835 tristate "Broadcom BCM2835 SDHOST MMC Controller support" depends on ARCH_BCM2835 || COMPILE_TEST - depends on HAS_DMA help This selects the BCM2835 SDHOST MMC controller. If you have a BCM2835 platform with SD or MMC devices, say Y or M here.