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

Commit ac558ca2 authored by Holger Schurig's avatar Holger Schurig Committed by David S. Miller
Browse files

[PATCH] libertas: make more functions static & remove unused functions 



Some functions where declared in header files, but used only once. They are
now static functions.

After doing this, I found out that some functions weren't used at all. I
removed this dead code.

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

drivers/net/wireless/libertas/11d.c

+0 −44
Original line number Diff line number Diff line
@@ -446,25 +446,6 @@ void libertas_init_11d(wlan_private * priv) 
	return;

}



static int wlan_enable_11d(wlan_private * priv, u8 flag)

{

	int ret;



	priv->adapter->enable11d = flag;



	/* send cmd to FW to enable/disable 11D function in FW */

	ret = libertas_prepare_and_send_command(priv,

				    CMD_802_11_SNMP_MIB,

				    CMD_ACT_SET,

				    CMD_OPTION_WAITFORRSP,

				    OID_802_11D_ENABLE,

				    &priv->adapter->enable11d);

	if (ret)

		lbs_deb_11d("11D: Fail to enable 11D \n");



	return 0;

}



/**

 *  @brief This function sets DOMAIN INFO to FW

 *  @param priv       pointer to wlan_private
@@ -577,31 +558,6 @@ int libertas_cmd_802_11d_domain_info(wlan_private * priv, 
	return 0;

}



/**

 *  @brief This function implements private cmd: enable/disable 11D

 *  @param priv    pointer to wlan_private

 *  @param wrq     pointer to user data

 *  @return 	   0 or -1

 */

int libertas_cmd_enable_11d(wlan_private * priv, struct iwreq *wrq)

{

	int data = 0;

	int *val;



	lbs_deb_enter(LBS_DEB_11D);

	data = SUBCMD_DATA(wrq);



	lbs_deb_11d("enable 11D: %s\n",

	       (data == 1) ? "enable" : "Disable");



	wlan_enable_11d(priv, data);

	val = (int *)wrq->u.name;

	*val = priv->adapter->enable11d;



	lbs_deb_enter(LBS_DEB_11D);

	return 0;

}



/**

 *  @brief This function parses countryinfo from AP and download country info to FW

 *  @param priv    pointer to wlan_private

drivers/net/wireless/libertas/11d.h

+0 −4
Original line number Diff line number Diff line
@@ -83,8 +83,6 @@ u8 libertas_get_scan_type_11d(u8 chan, 


u32 libertas_chan_2_freq(u8 chan, u8 band);



enum state_11d libertas_get_state_11d(wlan_private * priv);



void libertas_init_11d(wlan_private * priv);



int libertas_set_universaltable(wlan_private * priv, u8 band);
@@ -93,8 +91,6 @@ int libertas_cmd_802_11d_domain_info(wlan_private * priv, 
				 struct cmd_ds_command *cmd, u16 cmdno,

				 u16 cmdOption);



int libertas_cmd_enable_11d(wlan_private * priv, struct iwreq *wrq);



int libertas_ret_802_11d_domain_info(wlan_private * priv,

				 struct cmd_ds_command *resp);

drivers/net/wireless/libertas/cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -1045,7 +1045,7 @@ void __libertas_cleanup_and_insert_cmd(wlan_private * priv, struct cmd_ctrl_node 
	return;

}



void libertas_cleanup_and_insert_cmd(wlan_private * priv, struct cmd_ctrl_node *ptempcmd)

static void libertas_cleanup_and_insert_cmd(wlan_private * priv, struct cmd_ctrl_node *ptempcmd)

{

	unsigned long flags;

drivers/net/wireless/libertas/decl.h

+0 −7
Original line number Diff line number Diff line
@@ -15,14 +15,9 @@ struct wlan_private; 
struct sk_buff;

struct net_device;



extern char *libertas_fw_name;



void libertas_free_adapter(wlan_private * priv);

int libertas_set_mac_packet_filter(wlan_private * priv);



int libertas_send_null_packet(wlan_private * priv, u8 pwr_mgmt);

void libertas_send_tx_feedback(wlan_private * priv);

u8 libertas_check_last_packet_indication(wlan_private * priv);



int libertas_free_cmd_buffer(wlan_private * priv);

struct cmd_ctrl_node;
@@ -53,8 +48,6 @@ void libertas_upload_rx_packet(wlan_private * priv, struct sk_buff *skb); 
/** The proc fs interface */

int libertas_process_rx_command(wlan_private * priv);

int libertas_process_tx(wlan_private * priv, struct sk_buff *skb);

void libertas_cleanup_and_insert_cmd(wlan_private * priv,

					struct cmd_ctrl_node *ptempcmd);

void __libertas_cleanup_and_insert_cmd(wlan_private * priv,

					struct cmd_ctrl_node *ptempcmd);

drivers/net/wireless/libertas/if_usb.c

+5 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
static const char usbdriver_name[] = "usb8xxx";

static u8 *default_fw_name = "usb8388.bin";



char *libertas_fw_name = NULL;

static char *libertas_fw_name = NULL;

module_param_named(fw_name, libertas_fw_name, charp, 0644);



/*
@@ -51,6 +51,8 @@ static int if_usb_prog_firmware(wlan_private *); 
static int if_usb_host_to_card(wlan_private * priv, u8 type, u8 * payload, u16 nb);

static int if_usb_get_int_status(wlan_private * priv, u8 *);

static int if_usb_read_event_cause(wlan_private *);

static int usb_tx_block(wlan_private *priv, u8 *payload, u16 nb);

static void if_usb_free(struct usb_card_rec *cardp);



/**

 *  @brief  call back function to handle the status of the URB
@@ -92,7 +94,7 @@ static void if_usb_write_bulk_callback(struct urb *urb) 
 *  @param cardp	pointer usb_card_rec

 *  @return 	   	N/A

 */

void if_usb_free(struct usb_card_rec *cardp)

static void if_usb_free(struct usb_card_rec *cardp)

{

	lbs_deb_enter(LBS_DEB_USB);
@@ -384,7 +386,7 @@ static int if_usb_reset_device(wlan_private *priv) 
 *  @param nb		data length

 *  @return 	   	0 or -1

 */

int usb_tx_block(wlan_private * priv, u8 * payload, u16 nb)

static int usb_tx_block(wlan_private * priv, u8 * payload, u16 nb)

{

	/* pointer to card structure */

	struct usb_card_rec *cardp = priv->card;