Re: [PATCH v2] mmc: mmci: stop building qcom dml as module

From: Ulf Hansson
Date: Wed Aug 30 2017 - 09:14:23 EST


On 30 August 2017 at 14:22, <srinivas.kandagatla@xxxxxxxxxx> wrote:
> From: Srinivas Kandagatla <srinivas.kandagatla@xxxxxxxxxx>
>
> It does not make sense for qcom dml code to be a seperate module, as
> this has just 2 helper functions specific to qcom, and used directly by
> mmci driver, so just compile this along with main mmci driver.
>
> This would also fix issues arrising due to Kconfig combinations between
> mmci and qcom dml.
>
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@xxxxxxxxxx>

Thanks, applied for next!

Kind regards
Uffe

> ---
> drivers/mmc/host/Kconfig | 2 +-
> drivers/mmc/host/Makefile | 5 +++--
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index 5755b69..3345384 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -15,7 +15,7 @@ config MMC_ARMMMCI
> If unsure, say N.
>
> config MMC_QCOM_DML
> - tristate "Qualcomm Data Mover for SD Card Controller"
> + bool "Qualcomm Data Mover for SD Card Controller"
> depends on MMC_ARMMMCI && QCOM_BAM_DMA
> default y
> help
> diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
> index 4d45471..ef12fd2 100644
> --- a/drivers/mmc/host/Makefile
> +++ b/drivers/mmc/host/Makefile
> @@ -2,8 +2,9 @@
> # Makefile for MMC/SD host controller drivers
> #
>
> -obj-$(CONFIG_MMC_ARMMMCI) += mmci.o
> -obj-$(CONFIG_MMC_QCOM_DML) += mmci_qcom_dml.o
> +obj-$(CONFIG_MMC_ARMMMCI) += armmmci.o
> +armmmci-y := mmci.o
> +armmmci-$(CONFIG_MMC_QCOM_DML) += mmci_qcom_dml.o
> obj-$(CONFIG_MMC_PXA) += pxamci.o
> obj-$(CONFIG_MMC_MXC) += mxcmmc.o
> obj-$(CONFIG_MMC_MXS) += mxs-mmc.o
> --
> 2.9.3
>