From patchwork Thu Aug 10 14:54:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 9893881 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 2CB4C60325 for ; Thu, 10 Aug 2017 14:54:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1FCD328B47 for ; Thu, 10 Aug 2017 14:54:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 14A5428B49; Thu, 10 Aug 2017 14:54:31 +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 0521428B47 for ; Thu, 10 Aug 2017 14:54:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751439AbdHJOy1 (ORCPT ); Thu, 10 Aug 2017 10:54:27 -0400 Received: from mail-io0-f174.google.com ([209.85.223.174]:36363 "EHLO mail-io0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751440AbdHJOy0 (ORCPT ); Thu, 10 Aug 2017 10:54:26 -0400 Received: by mail-io0-f174.google.com with SMTP id g35so10453241ioi.3 for ; Thu, 10 Aug 2017 07:54:26 -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=pJdTbCuEUgNLp2MOEjRcDpiAbnMX6csAg1phuLJS2Fo=; b=J25qriOS4h/baMRMIy6B3pGwW2TfZ6hStoq1OYzZD1Pjuqax834Rw/1AgYLdtiECyy GptuwhErMEGB3UCbSHmRcMy07FqH7P+fH8O0Xwuu0Dbz5U+AZqkq1NRUdf9jIaRNSLQy h84FWOdLwJZs+iUk3eHwQMv3j07AkFFy3gLxU= 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=pJdTbCuEUgNLp2MOEjRcDpiAbnMX6csAg1phuLJS2Fo=; b=fhEapGwLuwh6x6RBD8jUHRilRMmfEDCphgUlQ3+/lpZ+LuD4sBFZIvyfZ4iAFTPudr vGkFznyhQv6hphxpd6MKl3z4BiETXwvIt4FGKEe8cqazcqFAGFAEbv1TWY0jfIovzZAl g+Lz4aaQDx/37/+j0O3kQQqbZkZi87EPo05vwfWyIN8md/vI1XA/ZQc7NcQ0cktMhYo0 K3BT6HAMa1k7bcGTkCrmbBiGL6c28S5i355rvdm+jxteiEoDWapevt0sP6uV6AddNTYj heAu1KtkoNAEV/GcdKg9FMH5IEjvzp/MP0np3wZhg+IoCBQRFwiXbUjEHsGARnBzE2kn vAzA== X-Gm-Message-State: AHYfb5ipnxa7JqImeRY3B60HzQguYCb3Htr2XgPxUI9bI53wtoyCycL7 nRYyiBxfAKk5/ITA X-Received: by 10.107.33.202 with SMTP id h193mr9312493ioh.1.1502376865509; Thu, 10 Aug 2017 07:54:25 -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 p194sm3308890itp.12.2017.08.10.07.54.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Aug 2017 07:54:25 -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] mmc: mmci: stop building qcom dml as module Date: Thu, 10 Aug 2017 16:54:18 +0200 Message-Id: <20170810145418.4430-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 +++-- drivers/mmc/host/mmci_qcom_dml.h | 2 +- 3 files changed, 5 insertions(+), 4 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 diff --git a/drivers/mmc/host/mmci_qcom_dml.h b/drivers/mmc/host/mmci_qcom_dml.h index 6e405d0..9df32eb 100644 --- a/drivers/mmc/host/mmci_qcom_dml.h +++ b/drivers/mmc/host/mmci_qcom_dml.h @@ -15,7 +15,7 @@ #ifndef __MMC_QCOM_DML_H__ #define __MMC_QCOM_DML_H__ -#ifdef CONFIG_MMC_QCOM_DML +#if IS_ENABLED(CONFIG_MMC_QCOM_DML) int dml_hw_init(struct mmci_host *host, struct device_node *np); void dml_start_xfer(struct mmci_host *host, struct mmc_data *data); #else