From patchwork Fri Aug 4 13:34:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 109398 Delivered-To: patch@linaro.org Received: by 10.182.109.195 with SMTP id hu3csp1375756obb; Fri, 4 Aug 2017 06:35:04 -0700 (PDT) X-Received: by 10.84.218.5 with SMTP id q5mr2807219pli.297.1501853704048; Fri, 04 Aug 2017 06:35:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501853704; cv=none; d=google.com; s=arc-20160816; b=E9BFyJg/22HB09qm1jwDd6P3EhYSo35qR+i01pjz0OVMwhJl8tcsfYrjWV9ihVZbn6 gu1ABtkqNDMhFkWTg6rBaWDvJfjE0YYvodC5YB7q28Mr2Jqa0ZTnTgS98DhaPWVYoGQL gcdH+WAlsxL3Dy62IZkg8+eCDL4Y9DYTNcYIXiKJ0kkNvkFW8Mt/SvJ3Sgs/WeXoEJdi yrflP4uUxuJUyTJcpwIhZofrmxV+h8Hlaf+elS6w527fjPWjjyB0mCpkU0S0sD0OECQk 28MzRHMjtcNti5KZX7xcV7PQ7tFgWZOCwS4t9qROV+XKiDIDn/slohWiiKfPFJJr9KCm NSrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=A769HYB3ZEljOUoo7ZtiVOWgdC8Rcn5Ec5iJwYFyMxY=; b=IZ0E+np+X8F7qa3Xs6o7j7fUcDVByqlJ8fsCgN/a97UX8/PB72YKhbmsNtWLQxu7jg X7WEfsuxOcpOhwc95u0bxrsAZ+/Mm5cyKzpYxQCoG+IARZgA0ihOgx0Zqiz5rFewf4/G 2xr3mwIB+GqcpNXve0cydp6mn2WmoQRBr/tADEHOOwoP3VJoXZoKAfx196DVC7YzQkxA 9gZLO5DA/WjN1AKTRyvdKwN1I16SW7Yu/UJQf2FeBDwSRlcgNf1hW2HD4rmf5JzjGwxS UlSPjJVsxmWNkuUo2gEK1Q2+jhuuU81TMHPoFgiJBvreQjuf7ZqnLP5Fy5iQK1XDrheT YgtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.b=DbAy2dnV; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b26si973208pgf.424.2017.08.04.06.35.03; Fri, 04 Aug 2017 06:35:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.b=DbAy2dnV; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752545AbdHDNfC (ORCPT + 6 others); Fri, 4 Aug 2017 09:35:02 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:45329 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752523AbdHDNfB (ORCPT ); Fri, 4 Aug 2017 09:35:01 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id v74DYPMF023143; Fri, 4 Aug 2017 22:34:25 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com v74DYPMF023143 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1501853666; bh=+T8K6ttUe3DueXgMVL9HRq0RVhM0pG2FY+MQAmrowgw=; h=From:To:Cc:Subject:Date:From; b=DbAy2dnVCDIXNul12hszMRCLI0nCirOCE8oGakosCFEXzBd7kXaiJZWFSwdo1THgq C6BGaB8w7BHH5zkrgzunnXqm/vGmrgy7FU2qaDWNDFMI3zqKWvjCfnLUvAfGSO+yQU Fh+/8kukd7GzErE0d9z55388OgRYsxfXMfSZ8IwUeCqqaOTnQZhlzbdNrTC9AFsQSJ AgTjBuhoeqmvk1m+mbdUv3TyZkBFMA4N2cv21nzSZBw5ajazFlzOh39YeP2iCSUeKm ns6AEJre853Yq4aFU0GibVab9WY1MHezlw0sCo9kuybte2RnQAET0i9GB/ex30jj2/ VNzrL41pYWaVg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-mmc@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org, Ulf Hansson Subject: [PATCH v2] mmc: mmci_qcom_dml: include mmci_qcom_dml.h and fix #ifdef Date: Fri, 4 Aug 2017 22:34:23 +0900 Message-Id: <1501853664-10752-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org 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 --- 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(-) -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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 #include #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