Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac94f196 authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcm80211: fmac: remove brcmf_usb_attrib structure 



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: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarFranky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: default avatarKan Yan <kanyan@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3bc7e29c

drivers/net/wireless/brcm80211/brcmfmac/usb.c

+9 −8
Original line number Original line Diff line number Diff line
@@ -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;

	}

	}

drivers/net/wireless/brcm80211/brcmfmac/usb.h

+2 −14
Original line number Original line Diff line number Diff line
@@ -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) */