Skip to content

L
linux
Commit 2a806340 authored by Pavel Machek's avatar Pavel Machek Committed by John W. Linville
Browse files
Options

[PATCH] usb wifi: zd1201 cleanups 

Cleanup coding style and other small stuff in zd1201. No real code
changes.
Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f6882a06
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 41 deletions
drivers/usb/net/zd1201.c
View file @ 2a806340
...@@ -33,7 +33,7 @@ static struct usb_device_id zd1201_table[] = { ...@@ -33,7 +33,7 @@ static struct usb_device_id zd1201_table[] = {
{} {}
}; };
static int ap = 0; /* Are we an AP or a normal station? */ static int ap; /* Are we an AP or a normal station? */
#define ZD1201_VERSION "0.15" #define ZD1201_VERSION "0.15"
...@@ -49,7 +49,7 @@ MODULE_DEVICE_TABLE(usb, zd1201_table); ...@@ -49,7 +49,7 @@ MODULE_DEVICE_TABLE(usb, zd1201_table);
static int zd1201_fw_upload(struct usb_device *dev, int apfw) static int zd1201_fw_upload(struct usb_device *dev, int apfw)
{ {
const struct firmware *fw_entry; const struct firmware *fw_entry;
char* data; char *data;
unsigned long len; unsigned long len;
int err; int err;
unsigned char ret; unsigned char ret;
...@@ -65,7 +65,7 @@ static int zd1201_fw_upload(struct usb_device *dev, int apfw) ...@@ -65,7 +65,7 @@ static int zd1201_fw_upload(struct usb_device *dev, int apfw)
if (err) { if (err) {
dev_err(&dev->dev, "Failed to load %s firmware file!\n", fwfile); dev_err(&dev->dev, "Failed to load %s firmware file!\n", fwfile);
dev_err(&dev->dev, "Make sure the hotplug firmware loader is installed.\n"); dev_err(&dev->dev, "Make sure the hotplug firmware loader is installed.\n");
dev_err(&dev->dev, "Goto http://linux-lc100020.sourceforge.net for more info\n"); dev_err(&dev->dev, "Goto http://linux-lc100020.sourceforge.net for more info.\n");
return err; return err;
} }
...@@ -94,12 +94,12 @@ static int zd1201_fw_upload(struct usb_device *dev, int apfw) ...@@ -94,12 +94,12 @@ static int zd1201_fw_upload(struct usb_device *dev, int apfw)
USB_DIR_OUT | 0x40, 0, 0, NULL, 0, ZD1201_FW_TIMEOUT); USB_DIR_OUT | 0x40, 0, 0, NULL, 0, ZD1201_FW_TIMEOUT);
if (err < 0) if (err < 0)
goto exit; goto exit;
err = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), 0x4, err = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), 0x4,
USB_DIR_IN | 0x40, 0,0, &ret, sizeof(ret), ZD1201_FW_TIMEOUT); USB_DIR_IN | 0x40, 0,0, &ret, sizeof(ret), ZD1201_FW_TIMEOUT);
if (err < 0) if (err < 0)
goto exit; goto exit;
if (ret & 0x80) { if (ret & 0x80) {
err = -EIO; err = -EIO;
goto exit; goto exit;
...@@ -166,13 +166,13 @@ static int zd1201_docmd(struct zd1201 *zd, int cmd, int parm0, ...@@ -166,13 +166,13 @@ static int zd1201_docmd(struct zd1201 *zd, int cmd, int parm0,
return -ENOMEM; return -ENOMEM;
} }
usb_fill_bulk_urb(urb, zd->usb, usb_sndbulkpipe(zd->usb, zd->endp_out2), usb_fill_bulk_urb(urb, zd->usb, usb_sndbulkpipe(zd->usb, zd->endp_out2),
command, 16, zd1201_usbfree, zd); command, 16, zd1201_usbfree, zd);
ret = usb_submit_urb(urb, GFP_ATOMIC); ret = usb_submit_urb(urb, GFP_ATOMIC);
if (ret) { if (ret) {
kfree(command); kfree(command);
usb_free_urb(urb); usb_free_urb(urb);
} }
return ret; return ret;
} }
...@@ -316,7 +316,7 @@ static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs) ...@@ -316,7 +316,7 @@ static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs)
fc = le16_to_cpu(*(__le16 *)&data[datalen-16]); fc = le16_to_cpu(*(__le16 *)&data[datalen-16]);
seq = le16_to_cpu(*(__le16 *)&data[datalen-24]); seq = le16_to_cpu(*(__le16 *)&data[datalen-24]);
if(zd->monitor) { if (zd->monitor) {
if (datalen < 24) if (datalen < 24)
goto resubmit; goto resubmit;
if (!(skb = dev_alloc_skb(datalen+24))) if (!(skb = dev_alloc_skb(datalen+24)))
...@@ -364,7 +364,7 @@ static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs) ...@@ -364,7 +364,7 @@ static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs)
goto resubmit; goto resubmit;
} }
hlist_for_each_entry(frag, node, &zd->fraglist, fnode) hlist_for_each_entry(frag, node, &zd->fraglist, fnode)
if(frag->seq == (seq&IEEE80211_SCTL_SEQ)) if (frag->seq == (seq&IEEE80211_SCTL_SEQ))
break; break;
if (!frag) if (!frag)
goto resubmit; goto resubmit;
...@@ -376,7 +376,6 @@ static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs) ...@@ -376,7 +376,6 @@ static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs)
goto resubmit; goto resubmit;
hlist_del_init(&frag->fnode); hlist_del_init(&frag->fnode);
kfree(frag); kfree(frag);
/* Fallthrough */
} else { } else {
if (datalen<14) if (datalen<14)
goto resubmit; goto resubmit;
...@@ -422,7 +421,7 @@ static int zd1201_getconfig(struct zd1201 *zd, int rid, void *riddata, ...@@ -422,7 +421,7 @@ static int zd1201_getconfig(struct zd1201 *zd, int rid, void *riddata,
int rid_fid; int rid_fid;
int length; int length;
unsigned char *pdata; unsigned char *pdata;
zd->rxdatas = 0; zd->rxdatas = 0;
err = zd1201_docmd(zd, ZD1201_CMDCODE_ACCESS, rid, 0, 0); err = zd1201_docmd(zd, ZD1201_CMDCODE_ACCESS, rid, 0, 0);
if (err) if (err)
...@@ -471,11 +470,11 @@ static int zd1201_getconfig(struct zd1201 *zd, int rid, void *riddata, ...@@ -471,11 +470,11 @@ static int zd1201_getconfig(struct zd1201 *zd, int rid, void *riddata,
length = zd->rxlen; length = zd->rxlen;
do { do {
int actual_length; int actual_length;
actual_length = (length > 64) ? 64 : length; actual_length = (length > 64) ? 64 : length;
if(pdata[0] != 0x3) { if (pdata[0] != 0x3) {
dev_dbg(&zd->usb->dev, "Rx Resource packet type error: %02X\n", dev_dbg(&zd->usb->dev, "Rx Resource packet type error: %02X\n",
pdata[0]); pdata[0]);
return -EINVAL; return -EINVAL;
...@@ -487,11 +486,10 @@ static int zd1201_getconfig(struct zd1201 *zd, int rid, void *riddata, ...@@ -487,11 +486,10 @@ static int zd1201_getconfig(struct zd1201 *zd, int rid, void *riddata,
} }
/* Skip the 4 bytes header (RID length and RID) */ /* Skip the 4 bytes header (RID length and RID) */
if(i == 0) { if (i == 0) {
pdata += 8; pdata += 8;
actual_length -= 8; actual_length -= 8;
} } else {
else {
pdata += 4; pdata += 4;
actual_length -= 4; actual_length -= 4;
} }
...@@ -620,7 +618,7 @@ static int zd1201_drvr_start(struct zd1201 *zd) ...@@ -620,7 +618,7 @@ static int zd1201_drvr_start(struct zd1201 *zd)
short max; short max;
__le16 zdmax; __le16 zdmax;
unsigned char *buffer; unsigned char *buffer;
buffer = kzalloc(ZD1201_RXSIZE, GFP_KERNEL); buffer = kzalloc(ZD1201_RXSIZE, GFP_KERNEL);
if (!buffer) if (!buffer)
return -ENOMEM; return -ENOMEM;
...@@ -632,7 +630,7 @@ static int zd1201_drvr_start(struct zd1201 *zd) ...@@ -632,7 +630,7 @@ static int zd1201_drvr_start(struct zd1201 *zd)
err = usb_submit_urb(zd->rx_urb, GFP_KERNEL); err = usb_submit_urb(zd->rx_urb, GFP_KERNEL);
if (err) if (err)
goto err_buffer; goto err_buffer;
err = zd1201_docmd(zd, ZD1201_CMDCODE_INIT, 0, 0, 0); err = zd1201_docmd(zd, ZD1201_CMDCODE_INIT, 0, 0, 0);
if (err) if (err)
goto err_urb; goto err_urb;
...@@ -684,7 +682,7 @@ static int zd1201_enable(struct zd1201 *zd) ...@@ -684,7 +682,7 @@ static int zd1201_enable(struct zd1201 *zd)
static int zd1201_disable(struct zd1201 *zd) static int zd1201_disable(struct zd1201 *zd)
{ {
int err; int err;
if (!zd->mac_enabled) if (!zd->mac_enabled)
return 0; return 0;
if (zd->monitor) { if (zd->monitor) {
...@@ -764,7 +762,6 @@ static int zd1201_net_open(struct net_device *dev) ...@@ -764,7 +762,6 @@ static int zd1201_net_open(struct net_device *dev)
static int zd1201_net_stop(struct net_device *dev) static int zd1201_net_stop(struct net_device *dev)
{ {
netif_stop_queue(dev); netif_stop_queue(dev);
return 0; return 0;
} }
...@@ -915,7 +912,6 @@ static int zd1201_get_name(struct net_device *dev, ...@@ -915,7 +912,6 @@ static int zd1201_get_name(struct net_device *dev,
struct iw_request_info *info, char *name, char *extra) struct iw_request_info *info, char *name, char *extra)
{ {
strcpy(name, "IEEE 802.11b"); strcpy(name, "IEEE 802.11b");
return 0; return 0;
} }
...@@ -1013,11 +1009,10 @@ static int zd1201_set_mode(struct net_device *dev, ...@@ -1013,11 +1009,10 @@ static int zd1201_set_mode(struct net_device *dev,
if (err) if (err)
return err; return err;
} }
zd->monitor=monitor; zd->monitor = monitor;
/* If monitor mode is set we don't actually turn it on here since it /* If monitor mode is set we don't actually turn it on here since it
* is done during mac reset anyway (see zd1201_mac_enable). * is done during mac reset anyway (see zd1201_mac_enable).
*/ */
zd1201_mac_reset(zd); zd1201_mac_reset(zd);
return 0; return 0;
...@@ -1117,7 +1112,7 @@ static int zd1201_get_wap(struct net_device *dev, ...@@ -1117,7 +1112,7 @@ static int zd1201_get_wap(struct net_device *dev,
zd->iwstats.qual.updated = 2; zd->iwstats.qual.updated = 2;
} }
return zd1201_getconfig(zd,ZD1201_RID_CURRENTBSSID,ap_addr->sa_data,6); return zd1201_getconfig(zd, ZD1201_RID_CURRENTBSSID, ap_addr->sa_data, 6);
} }
static int zd1201_set_scan(struct net_device *dev, static int zd1201_set_scan(struct net_device *dev,
...@@ -1275,7 +1270,7 @@ static int zd1201_set_rate(struct net_device *dev, ...@@ -1275,7 +1270,7 @@ static int zd1201_set_rate(struct net_device *dev,
if (!rrq->fixed) { /* Also enable all lower bitrates */ if (!rrq->fixed) { /* Also enable all lower bitrates */
rate |= rate-1; rate |= rate-1;
} }
err = zd1201_setconfig16(zd, ZD1201_RID_TXRATECNTL, rate); err = zd1201_setconfig16(zd, ZD1201_RID_TXRATECNTL, rate);
if (err) if (err)
return err; return err;
...@@ -1486,7 +1481,7 @@ static int zd1201_get_encode(struct net_device *dev, ...@@ -1486,7 +1481,7 @@ static int zd1201_get_encode(struct net_device *dev,
return -EINVAL; return -EINVAL;
erq->flags |= i+1; erq->flags |= i+1;
erq->length = zd->encode_keylen[i]; erq->length = zd->encode_keylen[i];
memcpy(key, zd->encode_keys[i], erq->length); memcpy(key, zd->encode_keys[i], erq->length);
...@@ -1529,11 +1524,7 @@ static int zd1201_set_power(struct net_device *dev, ...@@ -1529,11 +1524,7 @@ static int zd1201_set_power(struct net_device *dev,
return -EINVAL; return -EINVAL;
} }
out: out:
err = zd1201_setconfig16(zd, ZD1201_RID_CNFPMENABLED, enabled); return zd1201_setconfig16(zd, ZD1201_RID_CNFPMENABLED, enabled);
if (err)
return err;
return 0;
} }
static int zd1201_get_power(struct net_device *dev, static int zd1201_get_power(struct net_device *dev,
...@@ -1627,15 +1618,11 @@ static int zd1201_set_hostauth(struct net_device *dev, ...@@ -1627,15 +1618,11 @@ static int zd1201_set_hostauth(struct net_device *dev,
struct iw_request_info *info, struct iw_param *rrq, char *extra) struct iw_request_info *info, struct iw_param *rrq, char *extra)
{ {
struct zd1201 *zd = (struct zd1201 *)dev->priv; struct zd1201 *zd = (struct zd1201 *)dev->priv;
int err;
if (!zd->ap) if (!zd->ap)
return -EOPNOTSUPP; return -EOPNOTSUPP;
err = zd1201_setconfig16(zd, ZD1201_RID_CNFHOSTAUTH, rrq->value); return zd1201_setconfig16(zd, ZD1201_RID_CNFHOSTAUTH, rrq->value);
if (err)
return err;
return 0;
} }
static int zd1201_get_hostauth(struct net_device *dev, static int zd1201_get_hostauth(struct net_device *dev,
...@@ -1744,7 +1731,7 @@ static int zd1201_probe(struct usb_interface *interface, ...@@ -1744,7 +1731,7 @@ static int zd1201_probe(struct usb_interface *interface,
{ {
struct zd1201 *zd; struct zd1201 *zd;
struct usb_device *usb; struct usb_device *usb;
int i, err; int err;
short porttype; short porttype;
char buf[IW_ESSID_MAX_SIZE+2]; char buf[IW_ESSID_MAX_SIZE+2];
...@@ -1773,9 +1760,7 @@ static int zd1201_probe(struct usb_interface *interface, ...@@ -1773,9 +1760,7 @@ static int zd1201_probe(struct usb_interface *interface,
if (!zd->rx_urb || !zd->tx_urb) if (!zd->rx_urb || !zd->tx_urb)
goto err_zd; goto err_zd;
for(i = 0; i<100; i++) mdelay(100);
udelay(1000);
err = zd1201_drvr_start(zd); err = zd1201_drvr_start(zd);
if (err) if (err)
goto err_zd; goto err_zd;
...@@ -1833,7 +1818,7 @@ static int zd1201_probe(struct usb_interface *interface, ...@@ -1833,7 +1818,7 @@ static int zd1201_probe(struct usb_interface *interface,
goto err_net; goto err_net;
dev_info(&usb->dev, "%s: ZD1201 USB Wireless interface\n", dev_info(&usb->dev, "%s: ZD1201 USB Wireless interface\n",
zd->dev->name); zd->dev->name);
usb_set_intfdata(interface, zd); usb_set_intfdata(interface, zd);
return 0; return 0;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7