From patchwork Thu Jun 16 18:47:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Dooks X-Patchwork-Id: 9181493 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 9C86460760 for ; Thu, 16 Jun 2016 18:49:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F77828379 for ; Thu, 16 Jun 2016 18:49:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 843C328380; Thu, 16 Jun 2016 18:49:29 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3C8D928379 for ; Thu, 16 Jun 2016 18:49:29 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1bDcKg-0001ZQ-9X; Thu, 16 Jun 2016 18:48:02 +0000 Received: from 82-70-136-246.dsl.in-addr.zen.co.uk ([82.70.136.246] helo=rainbowdash.ducie.codethink.co.uk) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bDcKd-0001Xi-Nr for linux-arm-kernel@lists.infradead.org; Thu, 16 Jun 2016 18:48:00 +0000 Received: from ben by rainbowdash.ducie.codethink.co.uk with local (Exim 4.87) (envelope-from ) id 1bDcKE-0002cy-5j; Thu, 16 Jun 2016 19:47:34 +0100 From: Ben Dooks To: linux-kernel@lists.codethink.co.uk Subject: [PATCH] [V3] mmc: mmci: add missing include of mmci_qcom_dml.h Date: Thu, 16 Jun 2016 19:47:32 +0100 Message-Id: <1466102852-10063-1-git-send-email-ben.dooks@codethink.co.uk> X-Mailer: git-send-email 2.8.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160616_114759_957375_CE8B6EF3 X-CRM114-Status: GOOD ( 11.95 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-mmc@vger.kernel.org, Ulf Hansson , Ben Dooks , Srinivas Kandagatla , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Fix the missing declarations of dml_start_xfer() and dml_hw_init() by including mmci_qcom_dml.h to fix the following warnings: drivers/mmc/host/mmci_qcom_dml.c:57:6: warning: symbol 'dml_start_xfer' was not declared. Should it be static? drivers/mmc/host/mmci_qcom_dml.c:122:5: warning: symbol 'dml_hw_init' was not declared. Should it be static? Since the module build doesn't export symbols, also export the symbols from the mmci_qcom_dml.c file as otherwise the module link process won't work. It is possible this also fixes up module loading when both drivers are built as modules and not inserted in the correct order. Note, since this is a very small addition to the mmci module, it would better to build it into the main mmci driver (either by direct copy, or multiple linked module) Signed-off-by: Ben Dooks --- V1..V2: - deal with module build errors V2..V3: - add original authour and update list of recipients --- Cc: Srinivas Kandagatla Cc: Ulf Hansson Cc: linux-mmc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org --- drivers/mmc/host/mmci_qcom_dml.c | 3 +++ drivers/mmc/host/mmci_qcom_dml.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/mmci_qcom_dml.c b/drivers/mmc/host/mmci_qcom_dml.c index 2b7fc37..06858bd 100644 --- a/drivers/mmc/host/mmci_qcom_dml.c +++ b/drivers/mmc/host/mmci_qcom_dml.c @@ -18,6 +18,7 @@ #include #include #include "mmci.h" +#include "mmci_qcom_dml.h" /* Registers */ #define DML_CONFIG 0x00 @@ -97,6 +98,7 @@ void dml_start_xfer(struct mmci_host *host, struct mmc_data *data) /* make sure the dml is configured before dma is triggered */ wmb(); } +EXPORT_SYMBOL_GPL(dml_start_xfer); static int of_get_dml_pipe_index(struct device_node *np, const char *name) { @@ -175,3 +177,4 @@ int dml_hw_init(struct mmci_host *host, struct device_node *np) return 0; } +EXPORT_SYMBOL_GPL(dml_hw_init); diff --git a/drivers/mmc/host/mmci_qcom_dml.h b/drivers/mmc/host/mmci_qcom_dml.h index 6e405d0..d77873d 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 defined(CONFIG_MMC_QCOM_DML) || defined(CONFIG_MMC_QCOM_DML_MODULE) 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