Include mmci_qcom_dml.h from mmci_qcom_dml.c to fix the following sparse warnings: CHECK drivers/mmc/host/mmci_qcom_dml.c 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? Fixing them causes redefintion of dml_start_xfer error, revealing another problem in the header. #ifdef CONFIG_MMC_QCOM_DML is wrong because this driver is tristate. (CONFIG_MMC_QCOM_DML_MODULE is defined when it is built as a module) Since dml_hw_init() is called from mmci.c, IS_REACHABLE() is needed to cater to all the combinations. Signed-off-by: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx> --- Changes in v2: - Fix error reported by kbuild test robot (this patch is intended to replace commit 64f0aacb in linux-mmc/fixes drivers/mmc/host/mmci_qcom_dml.c | 1 + drivers/mmc/host/mmci_qcom_dml.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/mmci_qcom_dml.c b/drivers/mmc/host/mmci_qcom_dml.c index 00750c9d3514..95de699853d2 100644 --- a/drivers/mmc/host/mmci_qcom_dml.c +++ b/drivers/mmc/host/mmci_qcom_dml.c @@ -18,6 +18,7 @@ #include <linux/mmc/host.h> #include <linux/mmc/card.h> #include "mmci.h" +#include "mmci_qcom_dml.h" /* Registers */ #define DML_CONFIG 0x00 diff --git a/drivers/mmc/host/mmci_qcom_dml.h b/drivers/mmc/host/mmci_qcom_dml.h index 6e405d09d534..d5e88f102ba3 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_REACHABLE(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 -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
