lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usb: gadget: phonet: move global dev variable to its user

Browse Source 
cleanup patch only in preparation for configfs.

Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Andrzej Pietrasiewicz
2013-05-23 10:51:10 +02:00
committed by Felipe Balbi
parent 9b2252cace
commit 0189e63ad8
3 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/usb/gadget/f_phonet.c
View File

@@ -579,9 +579,8 @@ pn_unbind(struct usb_configuration *c, struct usb_function *f)
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static struct net_device *dev; int __init phonet_bind_config(struct usb_configuration *c,
struct net_device *dev)
int __init phonet_bind_config(struct usb_configuration *c)
{ {
struct f_phonet *fp; struct f_phonet *fp;
int err, size; int err, size;
@@ -606,16 +605,16 @@ int __init phonet_bind_config(struct usb_configuration *c)
return err; return err;
} }
int __init gphonet_setup(struct usb_gadget *gadget) struct net_device __init *gphonet_setup(struct usb_gadget *gadget)
{ {
struct net_device *dev;
struct phonet_port *port; struct phonet_port *port;
int err; int err;
/* Create net device */ /* Create net device */
BUG_ON(dev);
dev = alloc_netdev(sizeof(*port), "upnlink%d", pn_net_setup); dev = alloc_netdev(sizeof(*port), "upnlink%d", pn_net_setup);
if (!dev) if (!dev)
return -ENOMEM; return ERR_PTR(-ENOMEM);
port = netdev_priv(dev); port = netdev_priv(dev);
spin_lock_init(&port->lock); spin_lock_init(&port->lock);
@@ -623,12 +622,15 @@ int __init gphonet_setup(struct usb_gadget *gadget)
SET_NETDEV_DEV(dev, &gadget->dev); SET_NETDEV_DEV(dev, &gadget->dev);
err = register_netdev(dev); err = register_netdev(dev);
if (err) if (err) {
free_netdev(dev); free_netdev(dev);
return err;
return ERR_PTR(err);
}
return dev;
} }
void gphonet_cleanup(void) void gphonet_cleanup(struct net_device *dev)
{ {
unregister_netdev(dev); unregister_netdev(dev);
} }

14
drivers/usb/gadget/nokia.c
View File

@@ -106,6 +106,8 @@ static struct usb_function *f_obex2_cfg1;
static struct usb_function *f_obex1_cfg2; static struct usb_function *f_obex1_cfg2;
static struct usb_function *f_obex2_cfg2; static struct usb_function *f_obex2_cfg2;
static struct eth_dev *the_dev; static struct eth_dev *the_dev;
static struct net_device *phonet_dev;
static struct usb_configuration nokia_config_500ma_driver = { static struct usb_configuration nokia_config_500ma_driver = {
.label = "Bus Powered", .label = "Bus Powered",
@@ -136,7 +138,7 @@ static int __init nokia_bind_config(struct usb_configuration *c)
int obex1_stat = 0; int obex1_stat = 0;
int obex2_stat = 0; int obex2_stat = 0;
status = phonet_bind_config(c); status = phonet_bind_config(c, phonet_dev);
if (status) if (status)
pr_debug("could not bind phonet config\n"); pr_debug("could not bind phonet config\n");
@@ -211,9 +213,11 @@ static int __init nokia_bind(struct usb_composite_dev *cdev)
struct usb_gadget *gadget = cdev->gadget; struct usb_gadget *gadget = cdev->gadget;
int status; int status;
status = gphonet_setup(cdev->gadget); phonet_dev = gphonet_setup(cdev->gadget);
if (status < 0) if (IS_ERR(phonet_dev)) {
status = PTR_ERR(phonet_dev);
goto err_phonet; goto err_phonet;
}
the_dev = gether_setup(cdev->gadget, dev_addr, host_addr, host_mac, the_dev = gether_setup(cdev->gadget, dev_addr, host_addr, host_mac,
qmult); qmult);
@@ -278,7 +282,7 @@ err_obex2_inst:
err_usb: err_usb:
gether_cleanup(the_dev); gether_cleanup(the_dev);
err_ether: err_ether:
gphonet_cleanup(); gphonet_cleanup(phonet_dev);
err_phonet: err_phonet:
return status; return status;
} }
@@ -300,7 +304,7 @@ static int __exit nokia_unbind(struct usb_composite_dev *cdev)
if (!IS_ERR(fi_obex2)) if (!IS_ERR(fi_obex2))
usb_put_function_instance(fi_obex2); usb_put_function_instance(fi_obex2);
usb_put_function_instance(fi_acm); usb_put_function_instance(fi_acm);
gphonet_cleanup(); gphonet_cleanup(phonet_dev);
gether_cleanup(the_dev); gether_cleanup(the_dev);

6
drivers/usb/gadget/u_phonet.h
View File

@@ -14,8 +14,8 @@
#include <linux/usb/composite.h> #include <linux/usb/composite.h>
#include <linux/usb/cdc.h> #include <linux/usb/cdc.h>
int gphonet_setup(struct usb_gadget *gadget); struct net_device *gphonet_setup(struct usb_gadget *gadget);
int phonet_bind_config(struct usb_configuration *c); int phonet_bind_config(struct usb_configuration *c, struct net_device *dev);
void gphonet_cleanup(void); void gphonet_cleanup(struct net_device *dev);
#endif /* __U_PHONET_H */ #endif /* __U_PHONET_H */