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

brcm80211: fmac: remove brcmf_usb_attrib structure

Browse Source 
Several fields in this structure are only written once or not used
at all. Remaining two fields have been moved and brcmf_usb_attrib
definition has been removed.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: Kan Yan <kanyan@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Arend van Spriel
2012-03-02 22:55:46 +01:00
committed by John W. Linville
parent 3bc7e29c98
commit ac94f196a5
2 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/wireless/brcm80211/brcmfmac/usb.c
View File

@@ -897,8 +897,8 @@ brcmf_usb_dlneeded(struct brcmf_usbdev_info *devinfo)
sizeof(struct bootrom_id_le)); sizeof(struct bootrom_id_le));
return false; return false;
} else { } else {
devinfo->bus_pub.attrib.devid = chipid; devinfo->bus_pub.devid = chipid;
devinfo->bus_pub.attrib.chiprev = chiprev; devinfo->bus_pub.chiprev = chiprev;
} }
return true; return true;
} }
@@ -1064,7 +1064,7 @@ static int brcmf_usb_dlstart(struct brcmf_usbdev_info *devinfo, u8 *fw, int len)
if (devinfo == NULL) if (devinfo == NULL)
return -EINVAL; return -EINVAL;
if (devinfo->bus_pub.attrib.devid == 0xDEAD) if (devinfo->bus_pub.devid == 0xDEAD)
return -EINVAL; return -EINVAL;
err = brcmf_usb_dl_writeimage(devinfo, fw, len); err = brcmf_usb_dl_writeimage(devinfo, fw, len);
@@ -1085,7 +1085,7 @@ static int brcmf_usb_dlrun(struct brcmf_usbdev_info *devinfo)
if (!devinfo) if (!devinfo)
return -EINVAL; return -EINVAL;
if (devinfo->bus_pub.attrib.devid == 0xDEAD) if (devinfo->bus_pub.devid == 0xDEAD)
return -EINVAL; return -EINVAL;
/* Check we are runnable */ /* Check we are runnable */
@@ -1124,18 +1124,19 @@ static bool brcmf_usb_chip_support(int chipid, int chiprev)
static int static int
brcmf_usb_fw_download(struct brcmf_usbdev_info *devinfo) brcmf_usb_fw_download(struct brcmf_usbdev_info *devinfo)
{ {
struct brcmf_usb_attrib *attr; int devid, chiprev;
int err; int err;
brcmf_dbg(TRACE, "enter\n"); brcmf_dbg(TRACE, "enter\n");
if (devinfo == NULL) if (devinfo == NULL)
return -ENODEV; return -ENODEV;
attr = &devinfo->bus_pub.attrib; devid = devinfo->bus_pub.devid;
chiprev = devinfo->bus_pub.chiprev;
if (!brcmf_usb_chip_support(attr->devid, attr->chiprev)) { if (!brcmf_usb_chip_support(devid, chiprev)) {
brcmf_dbg(ERROR, "unsupported chip %d rev %d\n", brcmf_dbg(ERROR, "unsupported chip %d rev %d\n",
attr->devid, attr->chiprev); devid, chiprev);
return -EINVAL; return -EINVAL;
} }

16
drivers/net/wireless/brcm80211/brcmfmac/usb.h
View File

@@ -50,19 +50,6 @@ struct brcmf_stats {
}; };
struct brcmf_usb_attrib {
int bustype;
int vid;
int pid;
int devid;
int chiprev; /* chip revsion number */
int mtu;
int nchan; /* Data Channels */
int has_2nd_bulk_in_ep;
};
struct brcmf_usbdev_info;
struct brcmf_usbdev { struct brcmf_usbdev {
struct brcmf_bus *bus; struct brcmf_bus *bus;
struct brcmf_usbdev_info *devinfo; struct brcmf_usbdev_info *devinfo;
@@ -70,7 +57,8 @@ struct brcmf_usbdev {
struct brcmf_stats stats; struct brcmf_stats stats;
int ntxq, nrxq, rxsize; int ntxq, nrxq, rxsize;
u32 bus_mtu; u32 bus_mtu;
struct brcmf_usb_attrib attrib; int devid;
int chiprev; /* chip revsion number */
}; };
/* IO Request Block (IRB) */ /* IO Request Block (IRB) */