From patchwork Wed Aug 30 12:22:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 9929429 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 38F2260380 for ; Wed, 30 Aug 2017 12:22:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 30C3528522 for ; Wed, 30 Aug 2017 12:22:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 259202852B; Wed, 30 Aug 2017 12:22:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B99FD28522 for ; Wed, 30 Aug 2017 12:22:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751398AbdH3MWW (ORCPT ); Wed, 30 Aug 2017 08:22:22 -0400 Received: from mail-io0-f176.google.com ([209.85.223.176]:37786 "EHLO mail-io0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751345AbdH3MWV (ORCPT ); Wed, 30 Aug 2017 08:22:21 -0400 Received: by mail-io0-f176.google.com with SMTP id d78so2957280ioe.4 for ; Wed, 30 Aug 2017 05:22:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=0vL5OxVorrrCLzPMDwoU7BVcHEiuEPaQ1DfEUy239r8=; b=Cz6Wtiz+39Lhl3Uz4pn8AKYWOQ28uacXZ6KRqcbTvTz2snb1X+RC8YIBvKpH9JHSaf KBiPRs74VEvu9edWCRLrXvpBpLMzXaydCKm5l5jwS04+N4J1l0tI8Kr3iZEMblElFLpb UDOgFVwt4tgr2uJEF4mr7vch8/VqKkrmT9ux4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=0vL5OxVorrrCLzPMDwoU7BVcHEiuEPaQ1DfEUy239r8=; b=i0mUw2ZTE18XwEkRElRw+6YnUlQ8pvgknBCssJG5KLJTJeQWRwjQ/r7iTM1GbJS1p5 RI+I3kBPKIegoJ9JXRYEoj33ZU/w04Mtvb/4ItldnUV7r7IcfdnhBU96ohN3tR0CukEG AGNxLcRdvC3tMNqgzMh9mhCqH+DkYBc9C1LP3MpTPfXJbh1V1tSfs+enT8D2bBpx6dW9 yloY3t7b95jvkdu/hw3vZMEbsMdKW9Secn91sCLwR/zhbblFlRKcjInYL0rk80Bp+C6Y VN+HwJOjoyfNWLypLhH4hvZAIWDngThC7DhmXuB7fH7MvVGTwzYmBap6pvwjQn9dw4/z YDEw== X-Gm-Message-State: AHPjjUhulqtMQx6XmXWVm35f0PS3f9Cax+tknmkMman6c7JlXrzU8ktn PerSPsrgjip1nGR8 X-Google-Smtp-Source: ADKCNb7juJrxfPqR0tn93tJBrZvX2wHeIf3mr8VYi8OzZ1aICZxUiu6IGUsm2hL3QKQH4Rl1n5mnGg== X-Received: by 10.107.182.134 with SMTP id g128mr1221882iof.261.1504095741084; Wed, 30 Aug 2017 05:22:21 -0700 (PDT) Received: from localhost.localdomain (static.8.26.4.46.clients.your-server.de. [46.4.26.8]) by smtp.gmail.com with ESMTPSA id a68sm2507573ioa.69.2017.08.30.05.22.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Aug 2017 05:22:20 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: ulf.hansson@linaro.org Cc: arnd@arndb.de, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH v2] mmc: mmci: stop building qcom dml as module Date: Wed, 30 Aug 2017 14:22:12 +0200 Message-Id: <20170830122212.8590-1-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.11.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Srinivas Kandagatla 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 --- 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