From patchwork Mon Dec 9 15:08:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heikki Krogerus X-Patchwork-Id: 3311501 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7A694C0D4A for ; Mon, 9 Dec 2013 15:10:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C437E2017B for ; Mon, 9 Dec 2013 15:10:48 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5F89F2016C for ; Mon, 9 Dec 2013 15:10:47 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vq2TN-0000Yn-3A; Mon, 09 Dec 2013 15:10:13 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vq2TF-0007jm-4c; Mon, 09 Dec 2013 15:10:05 +0000 Received: from mga14.intel.com ([143.182.124.37]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vq2Sy-0007g4-QY for linux-arm-kernel@lists.infradead.org; Mon, 09 Dec 2013 15:09:50 +0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by azsmga102.ch.intel.com with ESMTP; 09 Dec 2013 07:09:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.93,858,1378882800"; d="scan'208";a="441039572" Received: from blue.fi.intel.com ([10.237.72.156]) by fmsmga001.fm.intel.com with ESMTP; 09 Dec 2013 07:09:00 -0800 From: Heikki Krogerus To: Kishon Vijay Abraham I Subject: [PATCH 1/5] phy: unify the phy name parameters Date: Mon, 9 Dec 2013 17:08:53 +0200 Message-Id: <1386601737-8735-2-git-send-email-heikki.krogerus@linux.intel.com> X-Mailer: git-send-email 1.8.5.1 In-Reply-To: <1386601737-8735-1-git-send-email-heikki.krogerus@linux.intel.com> References: <1386601737-8735-1-git-send-email-heikki.krogerus@linux.intel.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131209_100948_979407_498E7BCD X-CRM114-Status: GOOD ( 15.63 ) X-Spam-Score: -6.9 (------) Cc: linux-samsung-soc@vger.kernel.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Replace "string" and "port" that are used as phy name parameter for various functions with "con_id" which is commonly used in other frameworks. Signed-off-by: Heikki Krogerus --- drivers/phy/phy-core.c | 22 ++++++++++------------ include/linux/phy/phy.h | 8 ++++---- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c index 03cf8fb..1102aef 100644 --- a/drivers/phy/phy-core.c +++ b/drivers/phy/phy-core.c @@ -53,7 +53,7 @@ static int devm_phy_match(struct device *dev, void *res, void *match_data) return res == match_data; } -static struct phy *phy_lookup(struct device *device, const char *port) +static struct phy *phy_lookup(struct device *device, const char *con_id) { unsigned int count; struct phy *phy; @@ -68,7 +68,7 @@ static struct phy *phy_lookup(struct device *device, const char *port) consumers = phy->init_data->consumers; while (count--) { if (!strcmp(consumers->dev_name, dev_name(device)) && - !strcmp(consumers->port, port)) { + !strcmp(consumers->port, con_id)) { class_dev_iter_exit(&iter); return phy; } @@ -350,33 +350,32 @@ EXPORT_SYMBOL_GPL(of_phy_simple_xlate); /** * phy_get() - lookup and obtain a reference to a phy. * @dev: device that requests this phy - * @string: the phy name as given in the dt data or the name of the controller - * port for non-dt case + * @con_id: name of the phy from device's point of view * * Returns the phy driver, after getting a refcount to it; or * -ENODEV if there is no such phy. The caller is responsible for * calling phy_put() to release that count. */ -struct phy *phy_get(struct device *dev, const char *string) +struct phy *phy_get(struct device *dev, const char *con_id) { int index = 0; struct phy *phy = NULL; - if (string == NULL) { + if (con_id == NULL) { dev_WARN(dev, "missing string\n"); return ERR_PTR(-EINVAL); } if (dev->of_node) { index = of_property_match_string(dev->of_node, "phy-names", - string); + con_id); phy = of_phy_get(dev, index); if (IS_ERR(phy)) { dev_err(dev, "unable to find phy\n"); return phy; } } else { - phy = phy_lookup(dev, string); + phy = phy_lookup(dev, con_id); if (IS_ERR(phy)) { dev_err(dev, "unable to find phy\n"); return phy; @@ -395,14 +394,13 @@ EXPORT_SYMBOL_GPL(phy_get); /** * devm_phy_get() - lookup and obtain a reference to a phy. * @dev: device that requests this phy - * @string: the phy name as given in the dt data or phy device name - * for non-dt case + * @con_id: name of the phy from device's point of view * * Gets the phy using phy_get(), and associates a device with it using * devres. On driver detach, release function is invoked on the devres data, * then, devres data is freed. */ -struct phy *devm_phy_get(struct device *dev, const char *string) +struct phy *devm_phy_get(struct device *dev, const char *con_id) { struct phy **ptr, *phy; @@ -410,7 +408,7 @@ struct phy *devm_phy_get(struct device *dev, const char *string) if (!ptr) return ERR_PTR(-ENOMEM); - phy = phy_get(dev, string); + phy = phy_get(dev, con_id); if (!IS_ERR(phy)) { *ptr = phy; devres_add(dev, ptr); diff --git a/include/linux/phy/phy.h b/include/linux/phy/phy.h index 6d72269..d67dcbf 100644 --- a/include/linux/phy/phy.h +++ b/include/linux/phy/phy.h @@ -127,8 +127,8 @@ int phy_init(struct phy *phy); int phy_exit(struct phy *phy); int phy_power_on(struct phy *phy); int phy_power_off(struct phy *phy); -struct phy *phy_get(struct device *dev, const char *string); -struct phy *devm_phy_get(struct device *dev, const char *string); +struct phy *phy_get(struct device *dev, const char *con_id); +struct phy *devm_phy_get(struct device *dev, const char *con_id); void phy_put(struct phy *phy); void devm_phy_put(struct device *dev, struct phy *phy); struct phy *of_phy_simple_xlate(struct device *dev, @@ -199,12 +199,12 @@ static inline int phy_power_off(struct phy *phy) return -ENOSYS; } -static inline struct phy *phy_get(struct device *dev, const char *string) +static inline struct phy *phy_get(struct device *dev, const char *con_id) { return ERR_PTR(-ENOSYS); } -static inline struct phy *devm_phy_get(struct device *dev, const char *string) +static inline struct phy *devm_phy_get(struct device *dev, const char *con_id) { return ERR_PTR(-ENOSYS); }