Commit b55515cf authored by Scott Kidder's avatar Scott Kidder Committed by Greg Kroah-Hartman

Staging: otus: fix style issues in zdusb.c

This is a patch to zdusb.c that fixes whitespace,
C99 comment, and other style issues found by the
checkpatch.pl tool
Signed-off-by: default avatarScott Kidder <scott.kidder11@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 59457897
...@@ -60,9 +60,9 @@ extern u8_t zfLnxInitSetup(struct net_device *dev, struct usbdrv_private *macp); ...@@ -60,9 +60,9 @@ extern u8_t zfLnxInitSetup(struct net_device *dev, struct usbdrv_private *macp);
extern int usbdrv_close(struct net_device *dev); extern int usbdrv_close(struct net_device *dev);
extern u8_t zfLnxClearStructs(struct net_device *dev); extern u8_t zfLnxClearStructs(struct net_device *dev);
extern int zfWdsClose(struct net_device *dev); extern int zfWdsClose(struct net_device *dev);
extern int zfUnregisterWdsDev(struct net_device* parentDev, u16_t wdsId); extern int zfUnregisterWdsDev(struct net_device *parentDev, u16_t wdsId);
extern int zfLnxVapClose(struct net_device *dev); extern int zfLnxVapClose(struct net_device *dev);
extern int zfLnxUnregisterVapDev(struct net_device* parentDev, u16_t vapId); extern int zfLnxUnregisterVapDev(struct net_device *parentDev, u16_t vapId);
/* WDS */ /* WDS */
extern struct zsWdsStruct wds[ZM_WDS_PORT_NUMBER]; extern struct zsWdsStruct wds[ZM_WDS_PORT_NUMBER];
...@@ -85,7 +85,7 @@ static int zfLnxProbe(struct usb_interface *interface, ...@@ -85,7 +85,7 @@ static int zfLnxProbe(struct usb_interface *interface,
vendor_id = dev->descriptor.idVendor; vendor_id = dev->descriptor.idVendor;
product_id = dev->descriptor.idProduct; product_id = dev->descriptor.idProduct;
#ifdef HMAC_DEBUG #ifdef HMAC_DEBUG
printk(KERN_NOTICE "vendor_id = %04x\n", vendor_id); printk(KERN_NOTICE "vendor_id = %04x\n", vendor_id);
printk(KERN_NOTICE "product_id = %04x\n", product_id); printk(KERN_NOTICE "product_id = %04x\n", product_id);
...@@ -93,11 +93,10 @@ static int zfLnxProbe(struct usb_interface *interface, ...@@ -93,11 +93,10 @@ static int zfLnxProbe(struct usb_interface *interface,
printk(KERN_NOTICE "USB 2.0 Host\n"); printk(KERN_NOTICE "USB 2.0 Host\n");
else else
printk(KERN_NOTICE "USB 1.1 Host\n"); printk(KERN_NOTICE "USB 1.1 Host\n");
#endif #endif
macp = kzalloc(sizeof(struct usbdrv_private), GFP_KERNEL); macp = kzalloc(sizeof(struct usbdrv_private), GFP_KERNEL);
if (!macp) if (!macp) {
{
printk(KERN_ERR "out of memory allocating device structure\n"); printk(KERN_ERR "out of memory allocating device structure\n");
result = -ENOMEM; result = -ENOMEM;
goto fail; goto fail;
...@@ -105,8 +104,7 @@ static int zfLnxProbe(struct usb_interface *interface, ...@@ -105,8 +104,7 @@ static int zfLnxProbe(struct usb_interface *interface,
net = alloc_etherdev(0); net = alloc_etherdev(0);
if (net == NULL) if (net == NULL) {
{
printk(KERN_ERR "zfLnxProbe: Not able to alloc etherdev struct\n"); printk(KERN_ERR "zfLnxProbe: Not able to alloc etherdev struct\n");
result = -ENOMEM; result = -ENOMEM;
goto fail1; goto fail1;
...@@ -114,7 +112,7 @@ static int zfLnxProbe(struct usb_interface *interface, ...@@ -114,7 +112,7 @@ static int zfLnxProbe(struct usb_interface *interface,
strcpy(net->name, "ath%d"); strcpy(net->name, "ath%d");
net->ml_priv = macp; //kernel 2.6 net->ml_priv = macp; /* kernel 2.6 */
macp->udev = dev; macp->udev = dev;
macp->device = net; macp->device = net;
...@@ -122,28 +120,23 @@ static int zfLnxProbe(struct usb_interface *interface, ...@@ -122,28 +120,23 @@ static int zfLnxProbe(struct usb_interface *interface,
/* check out the endpoints */ /* check out the endpoints */
macp->interface = interface; macp->interface = interface;
//init_waitqueue_head(&macp->regSet_wait); /* init_waitqueue_head(&macp->regSet_wait); */
//init_waitqueue_head(&macp->iorwRsp_wait); /* init_waitqueue_head(&macp->iorwRsp_wait); */
//init_waitqueue_head(&macp->term_wait); /* init_waitqueue_head(&macp->term_wait); */
if (!zfLnxAllocAllUrbs(macp)) if (!zfLnxAllocAllUrbs(macp)) {
{
result = -ENOMEM; result = -ENOMEM;
goto fail2; goto fail2;
} }
if (!zfLnxInitSetup(net, macp)) if (!zfLnxInitSetup(net, macp)) {
{
result = -EIO; result = -EIO;
goto fail3; goto fail3;
} } else {
else
{
usb_set_intfdata(interface, macp); usb_set_intfdata(interface, macp);
SET_NETDEV_DEV(net, &interface->dev); SET_NETDEV_DEV(net, &interface->dev);
if (register_netdev(net) != 0) if (register_netdev(net) != 0) {
{
usb_set_intfdata(interface, NULL); usb_set_intfdata(interface, NULL);
goto fail3; goto fail3;
} }
...@@ -151,18 +144,15 @@ static int zfLnxProbe(struct usb_interface *interface, ...@@ -151,18 +144,15 @@ static int zfLnxProbe(struct usb_interface *interface,
netif_carrier_off(net); netif_carrier_off(net);
goto done; goto done;
fail3: fail3:
zfLnxFreeAllUrbs(macp); zfLnxFreeAllUrbs(macp);
fail2: fail2:
free_netdev(net); //kernel 2.6 free_netdev(net); /* kernel 2.6 */
fail1: fail1:
kfree(macp); kfree(macp);
fail: fail:
usb_put_dev(dev); usb_put_dev(dev);
macp = NULL; macp = NULL;
done: done:
return result; return result;
} }
...@@ -173,29 +163,26 @@ static void zfLnxDisconnect(struct usb_interface *interface) ...@@ -173,29 +163,26 @@ static void zfLnxDisconnect(struct usb_interface *interface)
printk(KERN_DEBUG "zfLnxDisconnect\n"); printk(KERN_DEBUG "zfLnxDisconnect\n");
if (!macp) if (!macp) {
{
printk(KERN_ERR "unregistering non-existant device\n"); printk(KERN_ERR "unregistering non-existant device\n");
return; return;
} }
if (macp->driver_isolated) if (macp->driver_isolated)
{
if (macp->device->flags & IFF_UP) if (macp->device->flags & IFF_UP)
usbdrv_close(macp->device); usbdrv_close(macp->device);
}
#if 0 #if 0
/* Close WDS */ /* Close WDS */
//zfWdsClose(wds[0].dev); /* zfWdsClose(wds[0].dev); */
/* Unregister WDS */ /* Unregister WDS */
//zfUnregisterWdsDev(macp->device, 0); /* zfUnregisterWdsDev(macp->device, 0); */
/* Close VAP */ /* Close VAP */
zfLnxVapClose(vap[0].dev); zfLnxVapClose(vap[0].dev);
/* Unregister VAP */ /* Unregister VAP */
zfLnxUnregisterVapDev(macp->device, 0); zfLnxUnregisterVapDev(macp->device, 0);
#endif #endif
zfLnxClearStructs(macp->device); zfLnxClearStructs(macp->device);
...@@ -203,14 +190,14 @@ static void zfLnxDisconnect(struct usb_interface *interface) ...@@ -203,14 +190,14 @@ static void zfLnxDisconnect(struct usb_interface *interface)
usb_put_dev(interface_to_usbdev(interface)); usb_put_dev(interface_to_usbdev(interface));
//printk(KERN_ERR "3. zfLnxUnlinkAllUrbs\n"); /* printk(KERN_ERR "3. zfLnxUnlinkAllUrbs\n"); */
//zfLnxUnlinkAllUrbs(macp); /* zfLnxUnlinkAllUrbs(macp); */
/* Free network interface */ /* Free network interface */
free_netdev(macp->device); free_netdev(macp->device);
zfLnxFreeAllUrbs(macp); zfLnxFreeAllUrbs(macp);
//zfLnxClearStructs(macp->device); /* zfLnxClearStructs(macp->device); */
kfree(macp); kfree(macp);
macp = NULL; macp = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment