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

Commit 634b8f49 authored by Holger Schurig's avatar Holger Schurig Committed by John W. Linville
Browse files

[PATCH] libertas: remove unused variables in wlan_dev_t 



Actually, this patch removev wlan_dev_t totally and puts the used variables
of it directly into wlan_private. That reduces one level of indirection and
looks a little bit simpler. It's now "priv->card" and not
"priv->wlan_dev.card" and "priv->dev" instead of "priv->wlan_dev.netdev"

Changed two occurences of "((wlan_private *) dev->priv)->wlan_dev.netdev"
into "dev", because I didn't see the point in doing pointer-ping-pong.

The variables "ioport", "upld_rcv" and "upld_type" where unused. They have
been removed.

Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ec3eef28

drivers/net/wireless/libertas/cmd.c

+3 −3
Original line number Diff line number Diff line
@@ -1823,7 +1823,7 @@ void libertas_send_iwevcustom_event(wlan_private * priv, s8 * str) 
	lbs_deb_cmd("Event Indication String length = %d\n", iwrq.data.length);



	lbs_deb_cmd("Sending wireless event IWEVCUSTOM for %s\n", str);

	wireless_send_event(priv->wlan_dev.netdev, IWEVCUSTOM, &iwrq, buf);

	wireless_send_event(priv->dev, IWEVCUSTOM, &iwrq, buf);



	lbs_deb_leave(LBS_DEB_CMD);

}
@@ -1842,7 +1842,7 @@ static int sendconfirmsleep(wlan_private * priv, u8 * cmdptr, u16 size) 
	lbs_dbg_hex("SEND_SLEEPC_CMD: Sleep confirm command", cmdptr, size);



	ret = priv->hw_host_to_card(priv, MVMS_CMD, cmdptr, size);

	priv->wlan_dev.dnld_sent = DNLD_RES_RECEIVED;

	priv->dnld_sent = DNLD_RES_RECEIVED;



	spin_lock_irqsave(&adapter->driver_lock, flags);

	if (adapter->intcounter || adapter->currenttxskb)
@@ -1926,7 +1926,7 @@ void libertas_ps_confirm_sleep(wlan_private * priv, u16 psmode) 


	lbs_deb_enter(LBS_DEB_CMD);



	if (priv->wlan_dev.dnld_sent) {

	if (priv->dnld_sent) {

		allowed = 0;

		lbs_deb_cmd("D");

	}

drivers/net/wireless/libertas/cmdresp.c

+6 −6
Original line number Diff line number Diff line
@@ -42,15 +42,15 @@ void libertas_mac_event_disconnected(wlan_private * priv) 
	 */



	msleep_interruptible(1000);

	wireless_send_event(priv->wlan_dev.netdev, SIOCGIWAP, &wrqu, NULL);

	wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);



	/* Free Tx and Rx packets */

	kfree_skb(priv->adapter->currenttxskb);

	priv->adapter->currenttxskb = NULL;



	/* report disconnect to upper layer */

	netif_stop_queue(priv->wlan_dev.netdev);

	netif_carrier_off(priv->wlan_dev.netdev);

	netif_stop_queue(priv->dev);

	netif_carrier_off(priv->dev);



	/* reset SNR/NF/RSSI values */

	memset(adapter->SNR, 0x00, sizeof(adapter->SNR));
@@ -218,7 +218,7 @@ static int wlan_ret_get_hw_spec(wlan_private * priv, 
			ETH_ALEN);

	}



	memcpy(priv->wlan_dev.netdev->dev_addr, adapter->current_addr, ETH_ALEN);

	memcpy(priv->dev->dev_addr, adapter->current_addr, ETH_ALEN);

	if (priv->mesh_dev)

		memcpy(priv->mesh_dev->dev_addr, adapter->current_addr,

		       ETH_ALEN);
@@ -774,14 +774,14 @@ int libertas_process_rx_command(wlan_private * priv) 
	resp = (struct cmd_ds_command *)(adapter->cur_cmd->bufvirtualaddr);



	lbs_dbg_hex("CMD_RESP:", adapter->cur_cmd->bufvirtualaddr,

		priv->wlan_dev.upld_len);

		priv->upld_len);



	respcmd = le16_to_cpu(resp->command);



	result = le16_to_cpu(resp->result);



	lbs_deb_cmd("CMD_RESP: %x result: %d length: %d\n", respcmd,

	       result, priv->wlan_dev.upld_len);

	       result, priv->upld_len);



	if (!(respcmd & 0x8000)) {

		lbs_deb_cmd("Invalid response to command!");

drivers/net/wireless/libertas/debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static ssize_t libertas_extscan(struct file *file, const char __user *userbuf, 
	libertas_send_specific_SSID_scan(priv, &extscan_ssid, 1);



	memset(&wrqu, 0, sizeof(union iwreq_data));

	wireless_send_event(priv->wlan_dev.netdev, SIOCGIWSCAN, &wrqu, NULL);

	wireless_send_event(priv->dev, SIOCGIWSCAN, &wrqu, NULL);



out_unlock:

	free_page(addr);
@@ -387,7 +387,7 @@ static ssize_t libertas_setuserscan(struct file *file, 
				 !priv->adapter->nr_cmd_pending);



	memset(&wrqu, 0x00, sizeof(union iwreq_data));

	wireless_send_event(priv->wlan_dev.netdev, SIOCGIWSCAN, &wrqu, NULL);

	wireless_send_event(priv->dev, SIOCGIWSCAN, &wrqu, NULL);



out_unlock:

	free_page(addr);

drivers/net/wireless/libertas/dev.h

+14 −26
Original line number Diff line number Diff line
@@ -89,31 +89,6 @@ struct sleep_params { 
	u16 sp_reserved;

};



/** Data structure for the Marvell WLAN device */

typedef struct _wlan_dev {

	/** device name */

	char name[DEV_NAME_LEN];

	/** card pointer */

	void *card;

	/** IO port */

	u32 ioport;

	/** Upload received */

	u32 upld_rcv;

	/** Upload type */

	u32 upld_typ;

	/** Upload length */

	u32 upld_len;

	/** netdev pointer */

	struct net_device *netdev;

	/* Upload buffer */

	u8 upld_buf[WLAN_UPLD_SIZE];

	/* Download sent:

	   bit0 1/0=data_sent/data_tx_done,

	   bit1 1/0=cmd_sent/cmd_tx_done,

	   all other bits reserved 0 */

	u8 dnld_sent;

} wlan_dev_t, *pwlan_dev_t;



/* Mesh statistics */

struct wlan_mesh_stats {

	u32	fwd_bcast_cnt;		/* Fwd: Broadcast counter */
@@ -132,8 +107,11 @@ struct _wlan_private { 
	int mesh_open;

	int infra_open;



	char name[DEV_NAME_LEN];



	void *card;

	wlan_adapter *adapter;

	wlan_dev_t wlan_dev;

	struct net_device *dev;



	struct net_device_stats stats;

	struct net_device *mesh_dev ; /* Virtual device */
@@ -154,6 +132,16 @@ struct _wlan_private { 
	u32 bbp_offset;

	u32 rf_offset;



	/** Upload length */

	u32 upld_len;

	/* Upload buffer */

	u8 upld_buf[WLAN_UPLD_SIZE];

	/* Download sent:

	   bit0 1/0=data_sent/data_tx_done,

	   bit1 1/0=cmd_sent/cmd_tx_done,

	   all other bits reserved 0 */

	u8 dnld_sent;



	const struct firmware *firmware;

	struct device *hotplug_device;

drivers/net/wireless/libertas/if_bootcmd.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
 */

int if_usb_issue_boot_command(wlan_private *priv, int ivalue)

{

	struct usb_card_rec	*cardp = priv->wlan_dev.card;

	struct usb_card_rec	*cardp = priv->card;

	struct bootcmdstr	sbootcmd;

	int i;