From patchwork Wed Dec 20 14:09:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 122469 Delivered-To: patches@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5625381qgn; Wed, 20 Dec 2017 06:09:31 -0800 (PST) X-Received: by 10.46.2.87 with SMTP id 84mr4780302ljc.0.1513778971407; Wed, 20 Dec 2017 06:09:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513778971; cv=none; d=google.com; s=arc-20160816; b=LOKah0Nqt4FmvCbSlPBRgrL3msPLJrxNg3sc4Gl/cEsQPgPcA1goXAOfxah9hEs9Gz r+85oh1t3CpCpyvLQ5d39E9GIq4AMceiCQb/PjXY6jObuGml8rHtY7e4PVHxeFycE1pF GcDgox6Ra9Vlp5fQ+BhMnYBIPaRWssou1b0NxaKjGbJRHCWgMS0/EgqV3pGiJTVuErGS EYv2wL6iUypQlDvEJp2UJA6571erOCn4OY41bWxjpiCGfwlEaXI6Vg2yX+vstxO0ydtm eHPE1f+OF4vcWAsMQWi5mJfNqucG99rfMm+WzcNwD4kF/2PJqfnSLiA0RfAzmlYKCTS/ HgSw== 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:arc-authentication-results; bh=+TtaXOcfRw6Y8LWNnibJ7kn4m7ks4WivbXXT89YJPN8=; b=rB8OAEaz/NizJ4hWmRxfNV/NWuYCb+DXCYPgrmmx9AZARgJTvlaXOeF/dX6TuJdxxV 1u4i8rWbDFPm9o2sFAVHoZETFH00MlrAZKUW+iuF4BSC7/H3Duj63JC9/LKrD/fjKqCk TfXIfKwx+xMnWnYGvtyCCRx7od3iAbOKFIx0SIaa3XE3GWJ5+NnZd9GZDoZg7hmA/Szz uAv1gcaOihc0AEHRIG/7eymwajuj8VXhNu+f3ozaZxnrt4sZirLtmamM7p1PQn47BnAh N2IcVfoMbeF+V2ynov0pop5Xp4v/5K9395rsI8h02DXNcb7NVjc8DPM++2SOj8d0Z4JC j1Ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=F+j8Zk8Z; 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 v14sor2919467lfi.108.2017.12.20.06.09.31 for (Google Transport Security); Wed, 20 Dec 2017 06:09:31 -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=F+j8Zk8Z; 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=+TtaXOcfRw6Y8LWNnibJ7kn4m7ks4WivbXXT89YJPN8=; b=F+j8Zk8ZMOOhQdHxcH+LURSoVc8I7+adMJKIOAyMQAHrxcaGCJnFlm3z8WtMgWRvyd /co0XPrTPKNY2JMJSvJO4AT5IBrB3EjI65lSI0O6dM0lB1H8K/T2VjvGNVDfMMqUIyEn +OgvpiidO2eCBLCQbBnvP8bzjHn1zTmanWKhc= 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=+TtaXOcfRw6Y8LWNnibJ7kn4m7ks4WivbXXT89YJPN8=; b=R9xuODTozJTBxnOXWEEH+nkh9UCTh15pMEI6A+OyU2FUuxBpAWXt7GSqMcEHCXx9jp +BWtaC4a5npYuQsSgwm90TtxHD9AA1s7ncjM3ig/59YvNpn0aewUrEcabc4J4oCyL/6D tRZwGRzS5o1YxH5XYFwvm3nGPkIsalwaGabd5H2MDAqn55B2t0dW0BDvNW81R/rj7JVH HVBOmrKeCNcgSoH5irdrLqyJJPTg7xxbVSwzJGEkEne5Jo9aptZQZr3HIQMx3KwIEho+ IFDe6JlKA6EEngtYZsy4jByj3wAejhRG1dSf5UG4dPeGUT2od859nkKEwRaafUAMyNnX bfgQ== X-Gm-Message-State: AKGB3mI41Dlzne/420T6VgiKah2SxZzpBLnXFcjZ0CrBXHFbJdCRdQ54 0i6gyjfGHki9C7AMk0c6FQHtxrlG X-Google-Smtp-Source: ACJfBotDctwvFMgO8ejewSZ2ZzxVL4uONt/4RQ14TJHn/6uvCAHHCY2QaeRDeMquB7Cynx8DrMb4Gg== X-Received: by 10.25.216.12 with SMTP id p12mr3429945lfg.21.1513778971040; Wed, 20 Dec 2017 06:09:31 -0800 (PST) Return-Path: Received: from localhost.localdomain (h-158-174-22-67.NA.cust.bahnhof.se. [158.174.22.67]) by smtp.gmail.com with ESMTPSA id f10sm3869505lff.56.2017.12.20.06.09.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Dec 2017 06:09:30 -0800 (PST) From: Ulf Hansson To: Kishon Vijay Abraham I , linux-kernel@vger.kernel.org Cc: "Rafael J . Wysocki" , linux-pm@vger.kernel.org, Yoshihiro Shimoda , Geert Uytterhoeven , linux-renesas-soc@vger.kernel.org, Ulf Hansson Subject: [PATCH v2 2/3] phy: core: Drop unused runtime PM APIs Date: Wed, 20 Dec 2017 15:09:19 +0100 Message-Id: <1513778960-10073-3-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513778960-10073-1-git-send-email-ulf.hansson@linaro.org> References: <1513778960-10073-1-git-send-email-ulf.hansson@linaro.org> The phy core already deploys runtime PM support, so there seems to be no obvious reason for having dedicated APIs to control runtime PM for phys. Therefore, let's remove the APIs altogether and instead convert internal needed functions to be static. Signed-off-by: Ulf Hansson --- drivers/phy/phy-core.c | 50 +++---------------------------------------------- include/linux/phy/phy.h | 45 -------------------------------------------- 2 files changed, 3 insertions(+), 92 deletions(-) -- 2.7.4 diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c index 09588ec..1621625 100644 --- a/drivers/phy/phy-core.c +++ b/drivers/phy/phy-core.c @@ -149,22 +149,7 @@ static struct phy_provider *of_phy_provider_lookup(struct device_node *node) return ERR_PTR(-EPROBE_DEFER); } -int phy_pm_runtime_get(struct phy *phy) -{ - int ret; - - if (!phy->use_runtime_pm) - return -ENOTSUPP; - - ret = pm_runtime_get(phy->dev.parent); - if (ret < 0 && ret != -EINPROGRESS) - pm_runtime_put_noidle(phy->dev.parent); - - return ret; -} -EXPORT_SYMBOL_GPL(phy_pm_runtime_get); - -int phy_pm_runtime_get_sync(struct phy *phy) +static int phy_pm_runtime_get_sync(struct phy *phy) { int ret; @@ -177,43 +162,14 @@ int phy_pm_runtime_get_sync(struct phy *phy) return ret; } -EXPORT_SYMBOL_GPL(phy_pm_runtime_get_sync); -int phy_pm_runtime_put(struct phy *phy) +static int phy_pm_runtime_put(struct phy *phy) { if (!phy->use_runtime_pm) return -ENOTSUPP; return pm_runtime_put(phy->dev.parent); } -EXPORT_SYMBOL_GPL(phy_pm_runtime_put); - -int phy_pm_runtime_put_sync(struct phy *phy) -{ - if (!phy->use_runtime_pm) - return -ENOTSUPP; - - return pm_runtime_put_sync(phy->dev.parent); -} -EXPORT_SYMBOL_GPL(phy_pm_runtime_put_sync); - -void phy_pm_runtime_allow(struct phy *phy) -{ - if (!phy->use_runtime_pm) - return; - - pm_runtime_allow(phy->dev.parent); -} -EXPORT_SYMBOL_GPL(phy_pm_runtime_allow); - -void phy_pm_runtime_forbid(struct phy *phy) -{ - if (!phy->use_runtime_pm) - return; - - pm_runtime_forbid(phy->dev.parent); -} -EXPORT_SYMBOL_GPL(phy_pm_runtime_forbid); int phy_init(struct phy *phy) { @@ -306,7 +262,7 @@ int phy_power_on(struct phy *phy) err_pwr_on: mutex_unlock(&phy->mutex); - phy_pm_runtime_put_sync(phy); + phy_pm_runtime_put(phy); err_pm_sync: if (phy->pwr) regulator_disable(phy->pwr); diff --git a/include/linux/phy/phy.h b/include/linux/phy/phy.h index b4298a1..050b620 100644 --- a/include/linux/phy/phy.h +++ b/include/linux/phy/phy.h @@ -17,7 +17,6 @@ #include #include #include -#include #include struct phy; @@ -134,12 +133,6 @@ static inline void *phy_get_drvdata(struct phy *phy) } #if IS_ENABLED(CONFIG_GENERIC_PHY) -int phy_pm_runtime_get(struct phy *phy); -int phy_pm_runtime_get_sync(struct phy *phy); -int phy_pm_runtime_put(struct phy *phy); -int phy_pm_runtime_put_sync(struct phy *phy); -void phy_pm_runtime_allow(struct phy *phy); -void phy_pm_runtime_forbid(struct phy *phy); int phy_init(struct phy *phy); int phy_exit(struct phy *phy); int phy_power_on(struct phy *phy); @@ -188,44 +181,6 @@ void devm_of_phy_provider_unregister(struct device *dev, int phy_create_lookup(struct phy *phy, const char *con_id, const char *dev_id); void phy_remove_lookup(struct phy *phy, const char *con_id, const char *dev_id); #else -static inline int phy_pm_runtime_get(struct phy *phy) -{ - if (!phy) - return 0; - return -ENOSYS; -} - -static inline int phy_pm_runtime_get_sync(struct phy *phy) -{ - if (!phy) - return 0; - return -ENOSYS; -} - -static inline int phy_pm_runtime_put(struct phy *phy) -{ - if (!phy) - return 0; - return -ENOSYS; -} - -static inline int phy_pm_runtime_put_sync(struct phy *phy) -{ - if (!phy) - return 0; - return -ENOSYS; -} - -static inline void phy_pm_runtime_allow(struct phy *phy) -{ - return; -} - -static inline void phy_pm_runtime_forbid(struct phy *phy) -{ - return; -} - static inline int phy_init(struct phy *phy) { if (!phy)