* [PATCH] usb: phy: moving all PHY API definitions to usb/phy directory
@ 2013-01-22 10:56 Venu Byravarasu
2013-01-22 11:00 ` Felipe Balbi
0 siblings, 1 reply; 3+ messages in thread
From: Venu Byravarasu @ 2013-01-22 10:56 UTC (permalink / raw)
To: balbi, gregkh; +Cc: linux-usb, linux-kernel, Venu Byravarasu
As drivers/usb/otg/otg.c contains most of the PHY related APIs
which are not OTG specific, moving them to more logical place
under driver/usb/phy.
Signed-off-by: Venu Byravarasu <vbyravarasu@nvidia.com>
---
drivers/usb/otg/otg.c | 184 ----------------------------------------------
drivers/usb/phy/Makefile | 1 +
2 files changed, 1 insertions(+), 184 deletions(-)
diff --git a/drivers/usb/otg/otg.c b/drivers/usb/otg/otg.c
index a30c041..95561b9 100644
--- a/drivers/usb/otg/otg.c
+++ b/drivers/usb/otg/otg.c
@@ -17,190 +17,6 @@
#include <linux/usb/otg.h>
-static LIST_HEAD(phy_list);
-static DEFINE_SPINLOCK(phy_lock);
-
-static struct usb_phy *__usb_find_phy(struct list_head *list,
- enum usb_phy_type type)
-{
- struct usb_phy *phy = NULL;
-
- list_for_each_entry(phy, list, head) {
- if (phy->type != type)
- continue;
-
- return phy;
- }
-
- return ERR_PTR(-ENODEV);
-}
-
-static void devm_usb_phy_release(struct device *dev, void *res)
-{
- struct usb_phy *phy = *(struct usb_phy **)res;
-
- usb_put_phy(phy);
-}
-
-static int devm_usb_phy_match(struct device *dev, void *res, void *match_data)
-{
- return res == match_data;
-}
-
-/**
- * devm_usb_get_phy - find the USB PHY
- * @dev - device that requests this phy
- * @type - the type of the phy the controller requires
- *
- * Gets the phy using usb_get_phy(), 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(struct device *dev, enum usb_phy_type type)
-{
- struct usb_phy **ptr, *phy;
-
- ptr = devres_alloc(devm_usb_phy_release, sizeof(*ptr), GFP_KERNEL);
- if (!ptr)
- return NULL;
-
- phy = usb_get_phy(type);
- if (!IS_ERR(phy)) {
- *ptr = phy;
- devres_add(dev, ptr);
- } else
- devres_free(ptr);
-
- return phy;
-}
-EXPORT_SYMBOL(devm_usb_get_phy);
-
-/**
- * usb_get_phy - find the USB PHY
- * @type - the type of the phy the controller requires
- *
- * 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(enum usb_phy_type type)
-{
- struct usb_phy *phy = NULL;
- unsigned long flags;
-
- spin_lock_irqsave(&phy_lock, flags);
-
- phy = __usb_find_phy(&phy_list, type);
- if (IS_ERR(phy)) {
- pr_err("unable to find transceiver of type %s\n",
- usb_phy_type_string(type));
- goto err0;
- }
-
- get_device(phy->dev);
-
-err0:
- spin_unlock_irqrestore(&phy_lock, flags);
-
- return phy;
-}
-EXPORT_SYMBOL(usb_get_phy);
-
-/**
- * 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()
- *
- * destroys the devres associated with this phy and invokes usb_put_phy
- * to release the phy.
- *
- * For use by USB host and peripheral drivers.
- */
-void devm_usb_put_phy(struct device *dev, struct usb_phy *phy)
-{
- int r;
-
- r = devres_destroy(dev, devm_usb_phy_release, devm_usb_phy_match, phy);
- dev_WARN_ONCE(dev, r, "couldn't find PHY resource\n");
-}
-EXPORT_SYMBOL(devm_usb_put_phy);
-
-/**
- * usb_put_phy - release the USB PHY
- * @x: the phy returned by usb_get_phy()
- *
- * Releases a refcount the caller received from usb_get_phy().
- *
- * For use by USB host and peripheral drivers.
- */
-void usb_put_phy(struct usb_phy *x)
-{
- if (x)
- put_device(x->dev);
-}
-EXPORT_SYMBOL(usb_put_phy);
-
-/**
- * usb_add_phy - declare the USB PHY
- * @x: the USB phy to be used; or NULL
- * @type - the type of this PHY
- *
- * This call is exclusively for use by phy drivers, which
- * coordinate the activities of drivers for host and peripheral
- * controllers, and in some cases for VBUS current regulation.
- */
-int usb_add_phy(struct usb_phy *x, enum usb_phy_type type)
-{
- int ret = 0;
- unsigned long flags;
- struct usb_phy *phy;
-
- if (x->type != USB_PHY_TYPE_UNDEFINED) {
- dev_err(x->dev, "not accepting initialized PHY %s\n", x->label);
- return -EINVAL;
- }
-
- spin_lock_irqsave(&phy_lock, flags);
-
- list_for_each_entry(phy, &phy_list, head) {
- if (phy->type == type) {
- ret = -EBUSY;
- dev_err(x->dev, "transceiver type %s already exists\n",
- usb_phy_type_string(type));
- goto out;
- }
- }
-
- x->type = type;
- list_add_tail(&x->head, &phy_list);
-
-out:
- spin_unlock_irqrestore(&phy_lock, flags);
- return ret;
-}
-EXPORT_SYMBOL(usb_add_phy);
-
-/**
- * usb_remove_phy - remove the OTG PHY
- * @x: the USB OTG PHY to be removed;
- *
- * This reverts the effects of usb_add_phy
- */
-void usb_remove_phy(struct usb_phy *x)
-{
- unsigned long flags;
-
- spin_lock_irqsave(&phy_lock, flags);
- if (x)
- list_del(&x->head);
- spin_unlock_irqrestore(&phy_lock, flags);
-}
-EXPORT_SYMBOL(usb_remove_phy);
-
const char *otg_state_string(enum usb_otg_state state)
{
switch (state) {
diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile
index 1a579a8..5a21017 100644
--- a/drivers/usb/phy/Makefile
+++ b/drivers/usb/phy/Makefile
@@ -4,6 +4,7 @@
ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG
+obj-y += usb_phy.o
obj-$(CONFIG_OMAP_USB2) += omap-usb2.o
obj-$(CONFIG_USB_ISP1301) += isp1301.o
obj-$(CONFIG_MV_U3D_PHY) += mv_u3d_phy.o
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] usb: phy: moving all PHY API definitions to usb/phy directory
2013-01-22 10:56 [PATCH] usb: phy: moving all PHY API definitions to usb/phy directory Venu Byravarasu
@ 2013-01-22 11:00 ` Felipe Balbi
2013-01-22 11:05 ` Venu Byravarasu
0 siblings, 1 reply; 3+ messages in thread
From: Felipe Balbi @ 2013-01-22 11:00 UTC (permalink / raw)
To: Venu Byravarasu; +Cc: balbi, gregkh, linux-usb, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 626 bytes --]
HI,
On Tue, Jan 22, 2013 at 04:26:50PM +0530, Venu Byravarasu wrote:
> As drivers/usb/otg/otg.c contains most of the PHY related APIs
> which are not OTG specific, moving them to more logical place
> under driver/usb/phy.
>
> Signed-off-by: Venu Byravarasu <vbyravarasu@nvidia.com>
> ---
> drivers/usb/otg/otg.c | 184 ----------------------------------------------
> drivers/usb/phy/Makefile | 1 +
missed git add of the new file, but hey, let's call it phy.c and place
it on drivers/usb/phy/phy.c
Also, you will have to rebase on top of Kishon's latest work which I'll
apply first.
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [PATCH] usb: phy: moving all PHY API definitions to usb/phy directory
2013-01-22 11:00 ` Felipe Balbi
@ 2013-01-22 11:05 ` Venu Byravarasu
0 siblings, 0 replies; 3+ messages in thread
From: Venu Byravarasu @ 2013-01-22 11:05 UTC (permalink / raw)
To: balbi; +Cc: gregkh, linux-usb, linux-kernel
> -----Original Message-----
> From: Felipe Balbi [mailto:balbi@ti.com]
> Sent: Tuesday, January 22, 2013 4:31 PM
> To: Venu Byravarasu
> Cc: balbi@ti.com; gregkh@linuxfoundation.org; linux-usb@vger.kernel.org;
> linux-kernel@vger.kernel.org
> Subject: Re: [PATCH] usb: phy: moving all PHY API definitions to usb/phy
> directory
>
> * PGP Signed by an unknown key
>
> HI,
>
> On Tue, Jan 22, 2013 at 04:26:50PM +0530, Venu Byravarasu wrote:
> > As drivers/usb/otg/otg.c contains most of the PHY related APIs
> > which are not OTG specific, moving them to more logical place
> > under driver/usb/phy.
> >
> > Signed-off-by: Venu Byravarasu <vbyravarasu@nvidia.com>
> > ---
> > drivers/usb/otg/otg.c | 184 ----------------------------------------------
> > drivers/usb/phy/Makefile | 1 +
>
> missed git add of the new file, but hey, let's call it phy.c and place
> it on drivers/usb/phy/phy.c
Yeah, I used "git commit -a" & missed adding new file.
Just few min back, sent a patch update.
>
> Also, you will have to rebase on top of Kishon's latest work which I'll
> apply first.
That's fine.
I'll rebase on top of Kishon's latest work and send v3.
In that v3 patch, will rename the file as phy.c, as you suggested above.
>
> --
> balbi
>
> * Unknown Key
> * 0x35CAA444
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-01-22 11:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-01-22 10:56 [PATCH] usb: phy: moving all PHY API definitions to usb/phy directory Venu Byravarasu
2013-01-22 11:00 ` Felipe Balbi
2013-01-22 11:05 ` Venu Byravarasu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.