lkml.org 
[lkml]   [2011]   [Sep]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCHv4 10/19] usb: otg: nop: Start using struct usb_otg
Date
Use struct usb_otg members with OTG specific functions instead
of usb_phy members.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
drivers/usb/otg/nop-usb-xceiv.c | 64 ++++++++++++++++++--------------------
1 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/drivers/usb/otg/nop-usb-xceiv.c b/drivers/usb/otg/nop-usb-xceiv.c
index 6a0c102..37ce4d3 100644
--- a/drivers/usb/otg/nop-usb-xceiv.c
+++ b/drivers/usb/otg/nop-usb-xceiv.c
@@ -33,7 +33,7 @@
#include <linux/slab.h>

struct nop_usb_xceiv {
- struct usb_phy otg;
+ struct usb_phy xceiv;
struct device *dev;
};

@@ -58,51 +58,37 @@ void usb_nop_xceiv_unregister(void)
}
EXPORT_SYMBOL(usb_nop_xceiv_unregister);

-static inline struct nop_usb_xceiv *xceiv_to_nop(struct usb_phy *x)
-{
- return container_of(x, struct nop_usb_xceiv, otg);
-}
-
static int nop_set_suspend(struct usb_phy *x, int suspend)
{
return 0;
}

-static int nop_set_peripheral(struct usb_phy *x,
- struct usb_gadget *gadget)
+static int nop_set_peripheral(struct usb_otg *otg, struct usb_gadget *gadget)
{
- struct nop_usb_xceiv *nop;
-
- if (!x)
+ if (!otg)
return -ENODEV;

- nop = xceiv_to_nop(x);
-
if (!gadget) {
- nop->otg.gadget = NULL;
+ otg->gadget = NULL;
return -ENODEV;
}

- nop->otg.gadget = gadget;
- nop->otg.state = USB_PHY_STATE_B_IDLE;
+ otg->gadget = gadget;
+ otg->xceiv->state = USB_PHY_STATE_B_IDLE;
return 0;
}

-static int nop_set_host(struct usb_phy *x, struct usb_bus *host)
+static int nop_set_host(struct usb_otg *otg, struct usb_bus *host)
{
- struct nop_usb_xceiv *nop;
-
- if (!x)
+ if (!otg)
return -ENODEV;

- nop = xceiv_to_nop(x);
-
if (!host) {
- nop->otg.host = NULL;
+ otg->host = NULL;
return -ENODEV;
}

- nop->otg.host = host;
+ otg->host = host;
return 0;
}

@@ -115,15 +101,23 @@ static int __devinit nop_usb_xceiv_probe(struct platform_device *pdev)
if (!nop)
return -ENOMEM;

+ nop->xceiv.otg = kzalloc(sizeof *nop->xceiv.otg, GFP_KERNEL);
+ if (!nop->xceiv.otg) {
+ kfree(nop);
+ return -ENOMEM;
+ }
+
nop->dev = &pdev->dev;
- nop->otg.dev = nop->dev;
- nop->otg.label = "nop-xceiv";
- nop->otg.state = USB_PHY_STATE_UNDEFINED;
- nop->otg.set_host = nop_set_host;
- nop->otg.set_peripheral = nop_set_peripheral;
- nop->otg.set_suspend = nop_set_suspend;
-
- err = otg_set_transceiver(&nop->otg);
+ nop->xceiv.dev = nop->dev;
+ nop->xceiv.label = "nop-xceiv";
+ nop->xceiv.set_suspend = nop_set_suspend;
+ nop->xceiv.state = USB_PHY_STATE_UNDEFINED;
+
+ nop->xceiv.otg->xceiv = &nop->xceiv;
+ nop->xceiv.otg->set_host = nop_set_host;
+ nop->xceiv.otg->set_peripheral = nop_set_peripheral;
+
+ err = usb_set_transceiver(&nop->xceiv);
if (err) {
dev_err(&pdev->dev, "can't register transceiver, err: %d\n",
err);
@@ -132,10 +126,11 @@ static int __devinit nop_usb_xceiv_probe(struct platform_device *pdev)

platform_set_drvdata(pdev, nop);

- ATOMIC_INIT_NOTIFIER_HEAD(&nop->otg.notifier);
+ ATOMIC_INIT_NOTIFIER_HEAD(&nop->xceiv.notifier);

return 0;
exit:
+ kfree(nop->xceiv.otg);
kfree(nop);
return err;
}
@@ -144,9 +139,10 @@ static int __devexit nop_usb_xceiv_remove(struct platform_device *pdev)
{
struct nop_usb_xceiv *nop = platform_get_drvdata(pdev);

- otg_set_transceiver(NULL);
+ usb_set_transceiver(NULL);

platform_set_drvdata(pdev, NULL);
+ kfree(nop->xceiv.otg);
kfree(nop);

return 0;
--
1.7.4.1


\
 
 \ /
  Last update: 2011-09-07 19:03    [W:0.111 / U:1.920 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site