From patchwork Wed Jun 19 08:52:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kishon Vijay Abraham I X-Patchwork-Id: 2748011 Return-Path: X-Original-To: patchwork-linux-omap@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 383F2C0AB1 for ; Wed, 19 Jun 2013 09:01:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EEAF1202B4 for ; Wed, 19 Jun 2013 09:01:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 77D23202C8 for ; Wed, 19 Jun 2013 09:01:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934326Ab3FSIxS (ORCPT ); Wed, 19 Jun 2013 04:53:18 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:52407 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934297Ab3FSIxO (ORCPT ); Wed, 19 Jun 2013 04:53:14 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id r5J8qj0A006620; Wed, 19 Jun 2013 03:52:45 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id r5J8qjdf003957; Wed, 19 Jun 2013 03:52:45 -0500 Received: from dlelxv22.itg.ti.com (172.17.1.197) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.2.342.3; Wed, 19 Jun 2013 03:52:45 -0500 Received: from a0393678ub.apr.dhcp.ti.com (a0393678ub.apr.dhcp.ti.com [172.24.145.11]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id r5J8qY52028730; Wed, 19 Jun 2013 03:52:42 -0500 From: Kishon Vijay Abraham I To: , , , , CC: , , , , , Subject: [PATCH 2/4] usb: phy: add a new API to get PHY ref by label Date: Wed, 19 Jun 2013 14:22:29 +0530 Message-ID: <1371631951-369-3-git-send-email-kishon@ti.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1371631951-369-1-git-send-email-kishon@ti.com> References: <1371631951-369-1-git-send-email-kishon@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 After the devices are created using PLATFORM_DEVID_AUTO, devm_usb_get_phy_dev and usb_get_phy_dev can't be used reliably as it relies on the device_names passed in usb_bind_phy. So added a new API to get the PHY reference by PHY label (PHY label should be filled which creating the PHY). Signed-off-by: Kishon Vijay Abraham I Acked-by: Felipe Balbi Tested-by: Tomi Valkeinen --- drivers/usb/phy/phy.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++ include/linux/usb/phy.h | 14 +++++++++ 2 files changed, 91 insertions(+) diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c index a9984c7..92bba2f 100644 --- a/drivers/usb/phy/phy.c +++ b/drivers/usb/phy/phy.c @@ -55,6 +55,21 @@ static struct usb_phy *__usb_find_phy_dev(struct device *dev, return ERR_PTR(-ENODEV); } +static struct usb_phy *__usb_find_phy_by_name(struct list_head *list, + const char *name) +{ + struct usb_phy *phy = NULL; + + list_for_each_entry(phy, list, head) { + if (strcmp(name, phy->label)) + continue; + + return phy; + } + + return ERR_PTR(-ENODEV); +} + static struct usb_phy *__of_usb_find_phy(struct device_node *node) { struct usb_phy *phy; @@ -272,6 +287,68 @@ struct usb_phy *devm_usb_get_phy_dev(struct device *dev, u8 index) EXPORT_SYMBOL_GPL(devm_usb_get_phy_dev); /** + * usb_get_phy_by_name - find the USB PHY using device ptr and phy label + * @name - the name of the phy + * + * Returns the phy driver, after getting a refcount to it; or + * -ENODEV if there is no such phy. The caller is responsible for + * calling usb_put_phy() to release that count. + * + * For use by USB host and peripheral drivers. + */ +struct usb_phy *usb_get_phy_by_name(const char *name) +{ + struct usb_phy *phy = NULL; + unsigned long flags; + + spin_lock_irqsave(&phy_lock, flags); + + phy = __usb_find_phy_by_name(&phy_list, name); + if (IS_ERR(phy) || !try_module_get(phy->dev->driver->owner)) { + pr_err("unable to find transceiver\n"); + goto err0; + } + + get_device(phy->dev); + +err0: + spin_unlock_irqrestore(&phy_lock, flags); + + return phy; +} +EXPORT_SYMBOL_GPL(usb_get_phy_by_name); + +/** + * devm_usb_get_phy_by_name - find the USB PHY using device ptr and phy label + * @dev - device that requests this phy + * @name - the label of the phy + * + * Gets the phy using usb_get_phy_by_name(), and associates a device with it + * using devres. On driver detach, release function is invoked on the devres + * data, then, devres data is freed. + * + * For use by USB host and peripheral drivers. + */ +struct usb_phy *devm_usb_get_phy_by_name(struct device *dev, const char *name) +{ + struct usb_phy **ptr, *phy; + + ptr = devres_alloc(devm_usb_phy_release, sizeof(*ptr), GFP_KERNEL); + if (!ptr) + return NULL; + + phy = usb_get_phy_by_name(name); + if (!IS_ERR(phy)) { + *ptr = phy; + devres_add(dev, ptr); + } else + devres_free(ptr); + + return phy; +} +EXPORT_SYMBOL_GPL(devm_usb_get_phy_by_name); + +/** * devm_usb_put_phy - release the USB PHY * @dev - device that wants to release this phy * @phy - the phy returned by devm_usb_get_phy() diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h index 6b5978f..8272cba 100644 --- a/include/linux/usb/phy.h +++ b/include/linux/usb/phy.h @@ -188,6 +188,9 @@ extern struct usb_phy *devm_usb_get_phy(struct device *dev, enum usb_phy_type type); extern struct usb_phy *usb_get_phy_dev(struct device *dev, u8 index); extern struct usb_phy *devm_usb_get_phy_dev(struct device *dev, u8 index); +extern struct usb_phy *usb_get_phy_by_name(const char *name); +extern struct usb_phy *devm_usb_get_phy_by_name(struct device *dev, + const char *name); extern struct usb_phy *devm_usb_get_phy_by_phandle(struct device *dev, const char *phandle, u8 index); extern void usb_put_phy(struct usb_phy *); @@ -216,6 +219,17 @@ static inline struct usb_phy *devm_usb_get_phy_dev(struct device *dev, u8 index) return ERR_PTR(-ENXIO); } +static inline struct usb_phy *usb_get_phy_by_name(const char *name) +{ + return ERR_PTR(-ENXIO); +} + +static inline struct usb_phy *devm_usb_get_phy_by_name(struct device *dev, + const char *name) +{ + return ERR_PTR(-ENXIO); +} + static inline struct usb_phy *devm_usb_get_phy_by_phandle(struct device *dev, const char *phandle, u8 index) {