From patchwork Wed Feb 13 19:54:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 158249 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp470138jaa; Wed, 13 Feb 2019 11:54:55 -0800 (PST) X-Received: by 2002:a2e:9f49:: with SMTP id v9mr1316518ljk.77.1550087695123; Wed, 13 Feb 2019 11:54:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550087695; cv=none; d=google.com; s=arc-20160816; b=CUPZCHsnCKaU0cJ0UeIIad+ndH65+yAmiDl7Z/LhTeaviN9a4X7EvEXyDBc7J9WeLo 4d4r67pV54uBL99lBsNxprnJFXRjM8BElL9Vdwf40I1ktpx0x31xM3aRGqdlgYpV7vVJ bPwa5d1jfK3+pq3O5COVGAh3/Du+dBGKqiZQiBclh8eqyqf4Pd0nADzpVN6M7aVY5QHU oOKHN+Cx5kfz3oPlaOkM6hYjL09tpgU0tLzpPcAP/yWnfNo5XqAOyWowAhSkNoxBXhPz AVgGBWPd7n6ZzzC3DA3Lhekd6Q/6bLUKjHf1YnBF5oSgl1BDDmPizG9W8mj42+tXiEfs J9Qw== 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=wZaZoCFjoOtW+NkB6SOQlGphxZkvtBrenisM/NI1+ws=; b=seI5zCOCxs4RKg8WUn7LRyrHm2vNSpXfK9vw/+WCn9TvT90AmhxFLgI24Jm5F8aaWA y7cjCaDjIlvU/g3BN63y2o1Ecp3tpCJDM1PYNJ9tgrp2OzYALBkb6GZaBCLS+jTwEmzR 0E/1JbOpfN8n4H67WilJH0Z0LWy6rfowwKWyET7UGqd5YLPuAsJKm0rUoT+8xWg6cKTk EkyDOfjfywKzSLm5qr1w7TxwNq1hMa4nnaZv87ddJl8skSuxWbPS90HMr0OO8SFjy6UB x/21O9cC7ABbzaPbQPqWgr/zGgTYIJ47op7D1SQseNVTCGQVjf9BcnRLIez64XAIEn5u oaQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="T/71x5mH"; 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 a4sor64937lfj.30.2019.02.13.11.54.54 for (Google Transport Security); Wed, 13 Feb 2019 11:54:55 -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="T/71x5mH"; 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=wZaZoCFjoOtW+NkB6SOQlGphxZkvtBrenisM/NI1+ws=; b=T/71x5mHp4/YbTSYnNrTLCIxKYNrZgx3TPTDkGJylA6ydHNgs25x5lTXZxFeqpoLNF H/f3ab9UCumMUOQyWuKzVg9lDpPCm1m24/1JaG3n0xScXWFSEvZJuv8harhYZdKX54r2 BVIHQUQ1ljAEB75+VpEU73lVXh/XBSOqYKUABESQTq/qovtRwLIwgsbJZK4nPAql1gZu q/EwBEI8XfNauGA8zS85pSb4W3b3DnWH2LfMLTbpEac9q1gMwIAT2msjZeCiWtrZvw7T sYnQE+3L1bbTtdRBnD9k/toZg6LGgXbpsdhChO0I3Vf30GhZwb6V4UFl0Dw/uR84Luuh gJEA== 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=wZaZoCFjoOtW+NkB6SOQlGphxZkvtBrenisM/NI1+ws=; b=V7Z+GYF34uDm3FRiE7i5+/NeQIe+mgIx6j7Jne6kZEbLUlYlJprBCZeRZa3QeUCq9g Wne6WR0PGBhPS+P+JTwKPG8sbWkWcEnHcvUjdyoYC2/URkwlIuY+yO9SDfr5E2/lY42W XmlSQpyjvSbMeumqfSlA3u2QWCVtwsnjgUqFFUSJpoouPt4S4LCrKjIq2AKLzSLUeQQt E8YyFNqnXR9nyTJH60xGyKgD9t65EKmRWP/QXlV7mmeEfSVR8WqR0xvgBhcJaOjVykq8 WYLbWXqHUguGVLoap2WbMuNO1OiMVcIPr49E99Lz0dP9EyPwSDff17WFg8i8H2PNNJ0X 7Lsw== X-Gm-Message-State: AHQUAuaMXNETMD0U3oQXU2mb0ktcqlt7EDq34cMrTO9iM0ao/ig9f1nm lDV6Io14w8viPUBxkQmX9fx10Kaw X-Google-Smtp-Source: AHgI3IbdqGwSgSZBf8gjVFizV2Sw5Y5te/C99WosOTYlWDoIIWcD/DWrNnOj6HFCBDqt0ZQ/ZA0GzQ== X-Received: by 2002:ac2:5090:: with SMTP id f16mr1451560lfm.132.1550087694592; Wed, 13 Feb 2019 11:54:54 -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 g194sm39169lfg.55.2019.02.13.11.54.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Feb 2019 11:54:53 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Adrian Hunter Cc: Ulf Hansson Subject: [PATCH 5/7] mmc: core: Convert mmc_regulator_get_ocrmask() to static Date: Wed, 13 Feb 2019 20:54:41 +0100 Message-Id: <20190213195443.18935-6-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190213195443.18935-1-ulf.hansson@linaro.org> References: <20190213195443.18935-1-ulf.hansson@linaro.org> The only left user of mmc_regulator_get_ocrmask() is the mmc core itself. Therefore, let's drop the export and turn it into static. Signed-off-by: Ulf Hansson --- drivers/mmc/core/regulator.c | 3 +-- include/linux/mmc/host.h | 6 ------ 2 files changed, 1 insertion(+), 8 deletions(-) -- 2.17.1 diff --git a/drivers/mmc/core/regulator.c b/drivers/mmc/core/regulator.c index 80f95f86ca0e..b6febbcf8978 100644 --- a/drivers/mmc/core/regulator.c +++ b/drivers/mmc/core/regulator.c @@ -58,7 +58,7 @@ static int mmc_ocrbitnum_to_vdd(int vdd_bit, int *min_uV, int *max_uV) * regulator. This would normally be called before registering the * MMC host adapter. */ -int mmc_regulator_get_ocrmask(struct regulator *supply) +static int mmc_regulator_get_ocrmask(struct regulator *supply) { int result = 0; int count; @@ -90,7 +90,6 @@ int mmc_regulator_get_ocrmask(struct regulator *supply) return result; } -EXPORT_SYMBOL_GPL(mmc_regulator_get_ocrmask); /** * mmc_regulator_set_ocr - set regulator to match host->ios voltage diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 7f93747c8cdc..43d0f0c496f6 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -507,17 +507,11 @@ void sdio_run_irqs(struct mmc_host *host); void sdio_signal_irq(struct mmc_host *host); #ifdef CONFIG_REGULATOR -int mmc_regulator_get_ocrmask(struct regulator *supply); int mmc_regulator_set_ocr(struct mmc_host *mmc, struct regulator *supply, unsigned short vdd_bit); int mmc_regulator_set_vqmmc(struct mmc_host *mmc, struct mmc_ios *ios); #else -static inline int mmc_regulator_get_ocrmask(struct regulator *supply) -{ - return 0; -} - static inline int mmc_regulator_set_ocr(struct mmc_host *mmc, struct regulator *supply, unsigned short vdd_bit)