xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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

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_obex2_cfg2;
static struct eth_dev *the_dev;
static struct net_device *phonet_dev;
static struct usb_configuration nokia_config_500ma_driver = {
.label = "Bus Powered",
@@ -136,7 +138,7 @@ static int __init nokia_bind_config(struct usb_configuration *c)
int obex1_stat = 0;
int obex2_stat = 0;
status = phonet_bind_config(c);
status = phonet_bind_config(c, phonet_dev);
if (status)
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;
int status;
status = gphonet_setup(cdev->gadget);
if (status < 0)
phonet_dev = gphonet_setup(cdev->gadget);
if (IS_ERR(phonet_dev)) {
status = PTR_ERR(phonet_dev);
goto err_phonet;
}
the_dev = gether_setup(cdev->gadget, dev_addr, host_addr, host_mac,
qmult);
@@ -278,7 +282,7 @@ err_obex2_inst:
err_usb:
gether_cleanup(the_dev);
err_ether:
gphonet_cleanup();
gphonet_cleanup(phonet_dev);
err_phonet:
return status;
}
@@ -300,7 +304,7 @@ static int __exit nokia_unbind(struct usb_composite_dev *cdev)
if (!IS_ERR(fi_obex2))
usb_put_function_instance(fi_obex2);
usb_put_function_instance(fi_acm);
gphonet_cleanup();
gphonet_cleanup(phonet_dev);
gether_cleanup(the_dev);