From patchwork Wed Mar 6 14:04:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 159750 Delivered-To: patches@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp6206063jad; Wed, 6 Mar 2019 06:05:06 -0800 (PST) X-Received: by 2002:ac2:4304:: with SMTP id l4mr2649120lfh.168.1551881106049; Wed, 06 Mar 2019 06:05:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551881106; cv=none; d=google.com; s=arc-20160816; b=kHCO1L953is+TWXpijylcHv3EShMiqbEf8O00RS94ehJki2NAbA5jUutWe/rcmocLU QC+/1v4S7SpyYKzXd+dhEje6+jM2sZ7FsQ51CYZVzGzKaouA6YEhcxq53b9MdbLGrrn6 U3phip5gDSbNh1qxbievt0oa0fTgscWbRqdxvvgdd3Kn58LvkDBF92R66wI1NSzkPEhj J6B+/4s4EvEA4cPIyYAzF/Kj2XOSpbnmoDzJrr58GUcggmgLxCaSJib1A0fElzkNF8ya GJOK+MgGsVguBQxLIcBl2csucb45AmFfGU0d5aQpzVAipqm8hIG3Cvx1678nOT7K50sh c7lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=DoU/c8AEdNJbAcgJ5zF6LsgzuA1UsaqrtPFabjRv7AE=; b=0YrwBhtNQyj9IGhW0FCsIkalBxrOxJaIQ2sGNCpejwm6CXYD7gopIYwgXNCktqLKRI +EsBAEWgk3QFGJBtd5VfXBMCt9IddfLNDJE1WHMGvR61Zlplmzvi1PT2Pgfne2d+0H4I WbJcRuCdP9MxYI/T+H4iwPMtVxQe/NNc5V5CM+Wt3ch0X4jIGJISEVso0hvgiRPUnkKS /6kZ5FSChAouwMxYPIglA42qC2P1Hzt+KOb1ynM1Olp0csj1txggod/up8ipt1C+NEoW 7+uaL/2jzfy5W9n74FghAdP2h1LOJBCpmfTO7JgjDL3/0dgC5VGChE4cPi2m7eg8DqcA uYmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=X81Cgmbk; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id l13sor515402lfh.31.2019.03.06.06.05.05 for (Google Transport Security); Wed, 06 Mar 2019 06:05:06 -0800 (PST) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=X81Cgmbk; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DoU/c8AEdNJbAcgJ5zF6LsgzuA1UsaqrtPFabjRv7AE=; b=X81CgmbkJrTeNXFa9+xsArINNs5x4qGHJTIInvaz3Zm6s8is9e+/Ty15eEoPk+CksV mtqhVYGXak/a2Dk3ZxWZ5LF3pvnHtdVGRkvuDWmGdDcJ/4SlW9NHIDGldPVAQKyFiOOa poZhmDAjx9tRXfjiouxa3n/gaduiUlQ6vbJuWNEkJa8zug8zx8rWg7JESNOnMAq1iDVN 4DRQXm3218BqbHR2bJNhGGNjNhbhcWZMosB0ALt/iqIZozvyBF37+6WNXpeBvzGT2FCl YjlZk8F7tIY554i8cFOOujJ8g9kubPQ8ehl8kyD8RIEMa+HXwkliFBJljm4pz11jxe6f e7BA== 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:in-reply-to :references; bh=DoU/c8AEdNJbAcgJ5zF6LsgzuA1UsaqrtPFabjRv7AE=; b=EwJdc7Eb6eHl+FeEzwoho9LXZYCxRvA1rPMz1DoPCwt08bC3so37ZygfRZnJmLrvPx 49OanX9M/Z1bEnf3zQPyhnBVble6zROhU4XUUyRlkWDbQflBfxTGpA//7QkCHM4R93Wx BUXEXxPi3Y3OxP5it89oK9c7qwIDO3un5tph9TQkCjksy0Dx8d0dxNxOP4y6UEkcCRCL DT6t7XkxQGaKw+VHjeL1HSbTMnjyfiutgf3TksikFWyV8JUv08eRZ9O6bfBExywe2c2u 95Y289464i6jvnFTvivCYP+IqYVBK+hDBaO2TmSfXRpbAV4wNu/gorc+SOn59A2PL3vi aqVg== X-Gm-Message-State: APjAAAUP+2fpr32JEa/rfjy2cquZ77TbiA/f47F1tM3RLPoUdPwbXROt uShylySz6+092yLiyq4tFYct7zaY X-Google-Smtp-Source: APXvYqxLmTisYem/Mvlgf5kZsqthWrmZf2Bry9q8DsQ0aFkQoAmqUtcHbr4y86dim3xV/XphFViyig== X-Received: by 2002:a19:f715:: with SMTP id z21mr3578668lfe.45.1551881105494; Wed, 06 Mar 2019 06:05:05 -0800 (PST) Return-Path: Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id o12sm343734ljc.37.2019.03.06.06.05.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Mar 2019 06:05:04 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ludovic Barre Cc: Russell King , Linus Walleij , Ulf Hansson Subject: [PATCH 4/6] mmc: mmci: Drop qcom specific header file Date: Wed, 6 Mar 2019 15:04:54 +0100 Message-Id: <20190306140456.28187-5-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190306140456.28187-1-ulf.hansson@linaro.org> References: <20190306140456.28187-1-ulf.hansson@linaro.org> It seems a bit silly to have a header file to share only the qcom_variant_init() function. So, let's just drop it and move the declaration of the function into the common mmci.h instead. Signed-off-by: Ulf Hansson --- drivers/mmc/host/mmci.c | 1 - drivers/mmc/host/mmci.h | 6 ++++++ drivers/mmc/host/mmci_qcom_dml.h | 26 -------------------------- 3 files changed, 6 insertions(+), 27 deletions(-) delete mode 100644 drivers/mmc/host/mmci_qcom_dml.h -- 2.17.1 diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 3e5baafb0ce2..e11fc5019535 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -43,7 +43,6 @@ #include #include "mmci.h" -#include "mmci_qcom_dml.h" #define DRIVER_NAME "mmci-pl18x" diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h index b368ed3acc29..a76fe1085757 100644 --- a/drivers/mmc/host/mmci.h +++ b/drivers/mmc/host/mmci.h @@ -441,3 +441,9 @@ int mmci_dmae_start(struct mmci_host *host, unsigned int *datactrl); void mmci_dmae_finalize(struct mmci_host *host, struct mmc_data *data); void mmci_dmae_error(struct mmci_host *host); #endif + +#ifdef CONFIG_MMC_QCOM_DML +void qcom_variant_init(struct mmci_host *host); +#else +static inline void qcom_variant_init(struct mmci_host *host) {} +#endif diff --git a/drivers/mmc/host/mmci_qcom_dml.h b/drivers/mmc/host/mmci_qcom_dml.h deleted file mode 100644 index 7e87eb9c4238..000000000000 --- a/drivers/mmc/host/mmci_qcom_dml.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * - * Copyright (c) 2011, The Linux Foundation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 and - * only version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - */ -#ifndef __MMC_QCOM_DML_H__ -#define __MMC_QCOM_DML_H__ - -#ifdef CONFIG_MMC_QCOM_DML -void qcom_variant_init(struct mmci_host *host); -#else -static inline void qcom_variant_init(struct mmci_host *host) -{ -} -#endif /* CONFIG_MMC_QCOM_DML */ - -#endif /* __MMC_QCOM_DML_H__ */