Commit 99a1f99f authored by Larry Finger's avatar Larry Finger
Browse files

staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part III 



Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent b9ffad08

drivers/staging/rtl8192e/r8192E_dev.h

+18 −12
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ bool rtl8192_GetHalfNmodeSupportByAPs(struct net_device* dev); 
bool rtl8192_GetNmodeSupportBySecCfg(struct net_device *dev);

bool rtl8192_HalTxCheckStuck(struct net_device *dev);

bool rtl8192_HalRxCheckStuck(struct net_device *dev);

void rtl8192_interrupt_recognized(struct net_device *dev, u32 *p_inta, u32 *p_intb);

void rtl8192_interrupt_recognized(struct net_device *dev, u32 *p_inta,

				  u32 *p_intb);

void rtl8192_enable_rx(struct net_device *dev);

void rtl8192_enable_tx(struct net_device *dev);

void rtl8192_EnableInterrupt(struct net_device *dev);
@@ -44,13 +45,18 @@ void rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val); 
void rtl8192_get_eeprom_size(struct net_device *dev);

bool rtl8192_adapter_start(struct net_device *dev);

void rtl8192_link_change(struct net_device *dev);

void rtl8192_AllowAllDestAddr(struct net_device* dev, bool bAllowAllDA, bool WriteIntoReg);

void  rtl8192_tx_fill_desc(struct net_device* dev, struct tx_desc * pdesc, struct cb_desc *cb_desc,

void rtl8192_AllowAllDestAddr(struct net_device *dev, bool bAllowAllDA,

			      bool WriteIntoReg);

void  rtl8192_tx_fill_desc(struct net_device *dev, struct tx_desc *pdesc,

			   struct cb_desc *cb_desc,

			   struct sk_buff *skb);

void  rtl8192_tx_fill_cmd_desc(struct net_device* dev, struct tx_desc_cmd * entry,

void  rtl8192_tx_fill_cmd_desc(struct net_device *dev,

			       struct tx_desc_cmd *entry,

			       struct cb_desc *cb_desc, struct sk_buff *skb);

bool rtl8192_rx_query_status_desc(struct net_device* dev, struct rtllib_rx_stats *stats,

				  struct rx_desc *pdesc, struct sk_buff* skb);

bool rtl8192_rx_query_status_desc(struct net_device *dev,

				  struct rtllib_rx_stats *stats,

				  struct rx_desc *pdesc,

				  struct sk_buff *skb);

void rtl8192_halt_adapter(struct net_device *dev, bool reset);

void rtl8192_update_ratr_table(struct net_device *dev);

#endif

drivers/staging/rtl8192e/r8192E_firmware.c

+87 −69
Original line number Diff line number Diff line
@@ -28,10 +28,12 @@ extern void firmware_init_param(struct net_device *dev) 
	struct r8192_priv *priv = rtllib_priv(dev);

	struct rt_firmware *pfirmware = priv->pFirmware;



	pfirmware->cmdpacket_frag_thresold = GET_COMMAND_PACKET_FRAG_THRESHOLD(MAX_TRANSMIT_BUFFER_SIZE);

	pfirmware->cmdpacket_frag_thresold = GET_COMMAND_PACKET_FRAG_THRESHOLD(

					     MAX_TRANSMIT_BUFFER_SIZE);

}



bool fw_download_code(struct net_device *dev, u8 *code_virtual_address, u32 buffer_len)

bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,

		      u32 buffer_len)

{

	struct r8192_priv *priv = rtllib_priv(dev);

	bool		    rt_status = true;
@@ -67,19 +69,25 @@ bool fw_download_code(struct net_device *dev, u8 *code_virtual_address, u32 buff 


		seg_ptr = skb->data;

		for (i = 0; i < frag_length; i += 4) {

			*seg_ptr++ = ((i+0)<frag_length)?code_virtual_address[i+3]:0;

			*seg_ptr++ = ((i+1)<frag_length)?code_virtual_address[i+2]:0;

			*seg_ptr++ = ((i+2)<frag_length)?code_virtual_address[i+1]:0;

			*seg_ptr++ = ((i+3)<frag_length)?code_virtual_address[i+0]:0;

			*seg_ptr++ = ((i+0) < frag_length) ?

				     code_virtual_address[i+3] : 0;

			*seg_ptr++ = ((i+1) < frag_length) ?

				     code_virtual_address[i+2] : 0;

			*seg_ptr++ = ((i+2) < frag_length) ?

				     code_virtual_address[i+1] : 0;

			*seg_ptr++ = ((i+3) < frag_length) ?

				     code_virtual_address[i+0] : 0;

		}

		tcb_desc->txbuf_size = (u16)i;

		skb_put(skb, i);



		if (!priv->rtllib->check_nic_enough_desc(dev, tcb_desc->queue_index) ||

			(!skb_queue_empty(&priv->rtllib->skb_waitQ[tcb_desc->queue_index]))||\

		    (!skb_queue_empty(&priv->rtllib->skb_waitQ[tcb_desc->queue_index])) ||

		    (priv->rtllib->queue_stop)) {

			RT_TRACE(COMP_FIRMWARE, "===================> tx full!\n");

			skb_queue_tail(&priv->rtllib->skb_waitQ[tcb_desc->queue_index], skb);

			RT_TRACE(COMP_FIRMWARE, "===================> tx "

				 "full!\n");

			skb_queue_tail(&priv->rtllib->skb_waitQ

					[tcb_desc->queue_index], skb);

		} else {

		priv->rtllib->softmac_hard_start_xmit(skb, dev);

		}
@@ -94,11 +102,7 @@ bool fw_download_code(struct net_device *dev, u8 *code_virtual_address, u32 buff 
	return rt_status;

}



bool

fwSendNullPacket(

	struct net_device *dev,

	u32			Length

)

bool fwSendNullPacket(struct net_device *dev, u32 Length)

{

	bool	rtStatus = true;

	struct r8192_priv *priv = rtllib_priv(dev);
@@ -119,10 +123,12 @@ fwSendNullPacket( 
	tcb_desc->txbuf_size = (u16)Length;



	if (!priv->rtllib->check_nic_enough_desc(dev, tcb_desc->queue_index) ||

			(!skb_queue_empty(&priv->rtllib->skb_waitQ[tcb_desc->queue_index]))||\

			(priv->rtllib->queue_stop) ) {

		RT_TRACE(COMP_FIRMWARE,"===================NULL packet================> tx full!\n");

		skb_queue_tail(&priv->rtllib->skb_waitQ[tcb_desc->queue_index], skb);

	    (!skb_queue_empty(&priv->rtllib->skb_waitQ[tcb_desc->

	    queue_index])) || (priv->rtllib->queue_stop)) {

		RT_TRACE(COMP_FIRMWARE, "===================NULL packet========"

			 "========> tx full!\n");

		skb_queue_tail(&priv->rtllib->skb_waitQ[tcb_desc->queue_index],

			       skb);

	} else {

		priv->rtllib->softmac_hard_start_xmit(skb, dev);

	}
@@ -142,7 +148,7 @@ bool CPUcheck_maincodeok_turnonCPU(struct net_device *dev) 
		CPU_status = read_nic_dword(dev, CPU_GEN);

		if (CPU_status & CPU_GEN_PUT_CODE_OK)

			break;

		msleep(2);

		mdelay(2);

	}



	if (!(CPU_status&CPU_GEN_PUT_CODE_OK)) {
@@ -153,7 +159,8 @@ bool CPUcheck_maincodeok_turnonCPU(struct net_device *dev) 
	}



	CPU_status = read_nic_dword(dev, CPU_GEN);

	write_nic_byte(dev, CPU_GEN, (u8)((CPU_status|CPU_GEN_PWR_STB_CPU)&0xff));

	write_nic_byte(dev, CPU_GEN,

		       (u8)((CPU_status|CPU_GEN_PWR_STB_CPU)&0xff));

	mdelay(1);



	timeout = jiffies + MSECS(200);
@@ -161,14 +168,13 @@ bool CPUcheck_maincodeok_turnonCPU(struct net_device *dev) 
		CPU_status = read_nic_dword(dev, CPU_GEN);

		if (CPU_status&CPU_GEN_BOOT_RDY)

			break;

		msleep(2);

		mdelay(2);

	}



	if (!(CPU_status&CPU_GEN_BOOT_RDY)) {

	if (!(CPU_status&CPU_GEN_BOOT_RDY))

		goto CPUCheckMainCodeOKAndTurnOnCPU_Fail;

	} else {

	else

		RT_TRACE(COMP_FIRMWARE, "Download Firmware: Boot ready!\n");

	}



	return rt_status;
@@ -190,7 +196,7 @@ bool CPUcheck_firmware_ready(struct net_device *dev) 
		CPU_status = read_nic_dword(dev, CPU_GEN);

		if (CPU_status&CPU_GEN_FIRM_RDY)

			break;

		msleep(2);

		mdelay(2);

	}



	if (!(CPU_status&CPU_GEN_FIRM_RDY))
@@ -207,7 +213,8 @@ bool CPUcheck_firmware_ready(struct net_device *dev) 


}



inline static bool firmware_check_ready(struct net_device *dev, u8 load_fw_status)

static bool firmware_check_ready(struct net_device *dev,

					u8 load_fw_status)

{

	struct r8192_priv *priv = rtllib_priv(dev);

	struct rt_firmware *pfirmware = priv->pFirmware;
@@ -222,11 +229,11 @@ inline static bool firmware_check_ready(struct net_device *dev, u8 load_fw_statu 
		pfirmware->firmware_status = FW_STATUS_2_MOVE_MAIN_CODE;



		rt_status = CPUcheck_maincodeok_turnonCPU(dev);

		if (rt_status) {

		if (rt_status)

			pfirmware->firmware_status = FW_STATUS_3_TURNON_CPU;

		} else {

			RT_TRACE(COMP_FIRMWARE, "CPUcheck_maincodeok_turnonCPU fail!\n");

		}

		else

			RT_TRACE(COMP_FIRMWARE, "CPUcheck_maincodeok_turnon"

				 "CPU fail!\n");



		break;
@@ -235,11 +242,11 @@ inline static bool firmware_check_ready(struct net_device *dev, u8 load_fw_statu 
		mdelay(1);



		rt_status = CPUcheck_firmware_ready(dev);

		if (rt_status) {

		if (rt_status)

			pfirmware->firmware_status = FW_STATUS_5_READY;

		} else {

			RT_TRACE(COMP_FIRMWARE, "CPUcheck_firmware_ready fail(%d)!\n",rt_status);

		}

		else

			RT_TRACE(COMP_FIRMWARE, "CPUcheck_firmware_ready fail"

				 "(%d)!\n", rt_status);



		break;

	default:
@@ -281,11 +288,13 @@ bool init_firmware(struct net_device *dev) 
		rst_opt = OPT_FIRMWARE_RESET;

		starting_state = FW_INIT_STEP2_DATA;

	} else {

		 RT_TRACE(COMP_FIRMWARE, "PlatformInitFirmware: undefined firmware state\n");

		RT_TRACE(COMP_FIRMWARE, "PlatformInitFirmware: undefined"

			 " firmware state\n");

	}



	priv->firmware_source = FW_SOURCE_IMG_FILE;

	for (init_step = starting_state; init_step <= FW_INIT_STEP2_DATA; init_step++) {

	for (init_step = starting_state; init_step <= FW_INIT_STEP2_DATA;

	     init_step++) {

		if (rst_opt == OPT_SYSTEM_RESET) {

			switch (priv->firmware_source) {

			case FW_SOURCE_IMG_FILE:
@@ -297,30 +306,39 @@ bool init_firmware(struct net_device *dev) 
							 };

					const struct firmware	*fw_entry;

					int rc;

					rc = request_firmware(&fw_entry, fw_name[init_step],&priv->pdev->dev);

					rc = request_firmware(&fw_entry,

					 fw_name[init_step], &priv->pdev->dev);

					if (rc < 0) {

						RT_TRACE(COMP_FIRMWARE, "request firmware fail!\n");

						RT_TRACE(COMP_FIRMWARE, "request firm"

						 "ware fail!\n");

						goto download_firmware_fail;

					}

					if (fw_entry->size > sizeof(pfirmware->firmware_buf[init_step])) {

						RT_TRACE(COMP_FIRMWARE, "img file size exceed the container struct buffer fail!\n");

					if (fw_entry->size >

				    sizeof(pfirmware->firmware_buf[init_step])) {

						RT_TRACE(COMP_FIRMWARE, "img file size "

						 "exceed the container struct "

						 "buffer fail!\n");

						goto download_firmware_fail;

					}



					if (init_step != FW_INIT_STEP1_MAIN) {

						memcpy(pfirmware->firmware_buf[init_step],fw_entry->data,fw_entry->size);

						pfirmware->firmware_buf_size[init_step] = fw_entry->size;

						memcpy(pfirmware->firmware_buf[init_step],

					       fw_entry->data, fw_entry->size);

						pfirmware->firmware_buf_size[init_step] =

					       fw_entry->size;



					} else {

						memset(pfirmware->firmware_buf[init_step],0,128);

						memcpy(&pfirmware->firmware_buf[init_step][128],fw_entry->data,fw_entry->size);

						pfirmware->firmware_buf_size[init_step] = fw_entry->size+128;

						memset(pfirmware->firmware_buf[init_step],

					       0, 128);

						memcpy(&pfirmware->firmware_buf[init_step][128],

					       fw_entry->data, fw_entry->size);

						pfirmware->firmware_buf_size[init_step] =

							 fw_entry->size + 128;

					}



					if (rst_opt == OPT_SYSTEM_RESET) {

					if (rst_opt == OPT_SYSTEM_RESET)

						release_firmware(fw_entry);

				}

				}

				mapped_file = pfirmware->firmware_buf[init_step];

				file_length = pfirmware->firmware_buf_size[init_step];

				break;

drivers/staging/rtl8192e/r8192E_hw.h

+40 −36
Original line number Diff line number Diff line
@@ -141,7 +141,8 @@ enum _RTL8192Pci_HW { 
	SIFS		= 0x03E,

	TCR			= 0x040,

	RCR			= 0x044,

#define RCR_FILTER_MASK (BIT0|BIT1|BIT2|BIT3|BIT5|BIT12|BIT18|BIT19|BIT20|BIT21|BIT22|BIT23)

#define RCR_FILTER_MASK (BIT0 | BIT1 | BIT2 | BIT3 | BIT5 | BIT12 |	\

			BIT18 | BIT19 | BIT20 | BIT21 | BIT22 | BIT23)

#define RCR_ONLYERLPKT		BIT31

#define RCR_ENCS2		BIT30

#define RCR_ENCS1		BIT29
@@ -422,12 +423,15 @@ enum _RTL8192Pci_HW { 
#define	RATR_MCS13		0x02000000

#define	RATR_MCS14		0x04000000

#define	RATR_MCS15		0x08000000

#define RATE_ALL_CCK		RATR_1M|RATR_2M|RATR_55M|RATR_11M

#define RATE_ALL_OFDM_AG	RATR_6M|RATR_9M|RATR_12M|RATR_18M|RATR_24M|RATR_36M|RATR_48M|RATR_54M

#define RATE_ALL_OFDM_1SS	RATR_MCS0|RATR_MCS1|RATR_MCS2|RATR_MCS3 | \

									RATR_MCS4|RATR_MCS5|RATR_MCS6	|RATR_MCS7

#define RATE_ALL_OFDM_2SS	RATR_MCS8|RATR_MCS9	|RATR_MCS10|RATR_MCS11| \

									RATR_MCS12|RATR_MCS13|RATR_MCS14|RATR_MCS15

#define RATE_ALL_CCK		(RATR_1M | RATR_2M | RATR_55M | RATR_11M)

#define RATE_ALL_OFDM_AG	(RATR_6M | RATR_9M | RATR_12M | RATR_18M | \

				RATR_24M | RATR_36M | RATR_48M | RATR_54M)

#define RATE_ALL_OFDM_1SS	(RATR_MCS0 | RATR_MCS1 | RATR_MCS2 |	\

				RATR_MCS3 | RATR_MCS4 | RATR_MCS5 |	\

				RATR_MCS6 | RATR_MCS7)

#define RATE_ALL_OFDM_2SS	(RATR_MCS8 | RATR_MCS9 | RATR_MCS10 |	\

				RATR_MCS11 | RATR_MCS12 | RATR_MCS13 |	\

				RATR_MCS14|RATR_MCS15)





	DRIVER_RSSI		= 0x32c,

drivers/staging/rtl8192e/r8192E_hwimg.c

+521 −522
Original line number Diff line number Diff line
@@ -2791,8 +2791,7 @@ u8 Rtl8192PciEFwDataArray[DataArrayLengthPciE] = { 
0x80,0x00,0x8f,0xd8,0x80,0x00,0x8f,0xec,0x80,0x00,0x90,0x00,0x80,0x00,0x8b,0x88,

};



u32 Rtl8192PciEPHY_REGArray[PHY_REGArrayLengthPciE] = {

0x0, };

u32 Rtl8192PciEPHY_REGArray[PHY_REGArrayLengthPciE] = {0x0,};



u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengthPciE] = {

	0x800, 0x00000000,

drivers/staging/rtl8192e/r8192E_firmware.h

+2 −2

File changed.

Contains only whitespace changes.