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

Commit 9e22cb67 authored by Dan Williams's avatar Dan Williams Committed by David S. Miller
Browse files

[PATCH] libertas: remove if_bootcmd.c 



Move the only function in it to if_usb.c, which was its
only user anyway.

Signed-off-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1e838bf3

drivers/net/wireless/libertas/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ libertas-objs := main.o fw.o wext.o \ 
		debugfs.o	  \

		ethtool.o assoc.o



usb8xxx-objs += if_bootcmd.o

usb8xxx-objs += if_usb.o



obj-$(CONFIG_LIBERTAS)     += libertas.o

drivers/net/wireless/libertas/if_bootcmd.c

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
/**

  * This file contains functions used in USB Boot command

  * and Boot2/FW update

  */



#include <linux/delay.h>

#include <linux/firmware.h>

#include <linux/netdevice.h>

#include <linux/usb.h>



#define DRV_NAME "usb8xxx"



#include "defs.h"

#include "dev.h"

#include "if_usb.h"



/**

 *  @brief This function issues Boot command to the Boot2 code

 *  @param ivalue   1:Boot from FW by USB-Download

 *                  2:Boot from FW in EEPROM

 *  @return 	   	0

 */

int if_usb_issue_boot_command(wlan_private *priv, int ivalue)

{

	struct usb_card_rec	*cardp = priv->card;

	struct bootcmdstr	sbootcmd;

	int i;



	/* Prepare command */

	sbootcmd.u32magicnumber = cpu_to_le32(BOOT_CMD_MAGIC_NUMBER);

	sbootcmd.u8cmd_tag = ivalue;

	for (i=0; i<11; i++)

		sbootcmd.au8dumy[i]=0x00;

	memcpy(cardp->bulk_out_buffer, &sbootcmd, sizeof(struct bootcmdstr));



	/* Issue command */

	usb_tx_block(priv, cardp->bulk_out_buffer, sizeof(struct bootcmdstr));



	return 0;

}

drivers/net/wireless/libertas/if_usb.c

+24 −0
Original line number Diff line number Diff line
@@ -803,6 +803,30 @@ static int if_usb_register_dev(wlan_private * priv) 
	return 0;

}



/**

 *  @brief This function issues Boot command to the Boot2 code

 *  @param ivalue   1:Boot from FW by USB-Download

 *                  2:Boot from FW in EEPROM

 *  @return 	   	0

 */

static int if_usb_issue_boot_command(wlan_private *priv, int ivalue)

{

	struct usb_card_rec	*cardp = priv->card;

	struct bootcmdstr	sbootcmd;

	int i;



	/* Prepare command */

	sbootcmd.u32magicnumber = cpu_to_le32(BOOT_CMD_MAGIC_NUMBER);

	sbootcmd.u8cmd_tag = ivalue;

	for (i=0; i<11; i++)

		sbootcmd.au8dumy[i]=0x00;

	memcpy(cardp->bulk_out_buffer, &sbootcmd, sizeof(struct bootcmdstr));



	/* Issue command */

	usb_tx_block(priv, cardp->bulk_out_buffer, sizeof(struct bootcmdstr));



	return 0;

}





static int if_usb_prog_firmware(wlan_private * priv)

drivers/net/wireless/libertas/if_usb.h

+0 −1
Original line number Diff line number Diff line
@@ -104,6 +104,5 @@ struct fwsyncheader { 


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

void if_usb_free(struct usb_card_rec *cardp);

int if_usb_issue_boot_command(wlan_private *priv, int ivalue);



#endif