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

Commit 593ef41c authored by Olimpiu Pascariu's avatar Olimpiu Pascariu Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8187se: fixed checkpatch.pl warnings and errors in r8180_rtl8225z2.c 



This is a patch to the r8180_rtl8225z2.c file that fixes up errors and
warnings found by the checkpatch.pl tool

Signed-off-by: default avatarOlimpiu Pascariu <olimpiu.pascariu@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 08db6c59

drivers/staging/rtl8187se/r8180_rtl8225z2.c

+78 −51
Original line number Diff line number Diff line 
/*

  This is part of the rtl8180-sa2400 driver

  released under the GPL (See file COPYING for details).

  Copyright (c) 2005 Andrea Merello <andreamrl@tiscali.it>



  This files contains programming code for the rtl8225

  radio frontend.



  *Many* thanks to Realtek Corp. for their great support!



 * This is part of the rtl8180-sa2400 driver

 * released under the GPL (See file COPYING for details).

 * Copyright (c) 2005 Andrea Merello <andreamrl@tiscali.it>

 *

 * This files contains programming code for the rtl8225

 * radio frontend.

 *

 * *Many* thanks to Realtek Corp. for their great support!

 */



#include "r8180_hw.h"
@@ -325,9 +324,11 @@ static u32 read_rtl8225(struct net_device *dev, u8 adr) 


	oval &= ~0xf;



	write_nic_word(dev, RFPinsOutput, oval | BB_HOST_BANG_EN ); udelay(4);

	write_nic_word(dev, RFPinsOutput, oval | BB_HOST_BANG_EN);

	udelay(4);



	write_nic_word(dev, RFPinsOutput, oval ); udelay(5);

	write_nic_word(dev, RFPinsOutput, oval);

	udelay(5);



	rw = 0;
@@ -335,31 +336,45 @@ static u32 read_rtl8225(struct net_device *dev, u8 adr) 


	for (i = 0; i < wLength/2; i++) {

		bit = ((data2Write&mask) != 0) ? 1 : 0;

		write_nic_word(dev, RFPinsOutput, bit|oval | rw); udelay(1);

		write_nic_word(dev, RFPinsOutput, bit | oval | rw);

		udelay(1);



		write_nic_word(dev, RFPinsOutput, bit|oval | BB_HOST_BANG_CLK | rw); udelay(2);

		write_nic_word(dev, RFPinsOutput, bit|oval | BB_HOST_BANG_CLK | rw); udelay(2);

		write_nic_word(dev, RFPinsOutput,

				bit | oval | BB_HOST_BANG_CLK | rw);

		udelay(2);

		write_nic_word(dev, RFPinsOutput,

				bit | oval | BB_HOST_BANG_CLK | rw);

		udelay(2);



		mask = (low2high) ? (mask<<1) : (mask>>1);



		if (i == 2) {

			rw = BB_HOST_BANG_RW;

			write_nic_word(dev, RFPinsOutput, bit|oval | BB_HOST_BANG_CLK | rw); udelay(2);

			write_nic_word(dev, RFPinsOutput, bit|oval | rw); udelay(2);

			write_nic_word(dev, RFPinsOutput,

					bit | oval | BB_HOST_BANG_CLK | rw);

			udelay(2);

			write_nic_word(dev, RFPinsOutput, bit | oval | rw);

			udelay(2);

			break;

		}



		bit = ((data2Write&mask) != 0) ? 1 : 0;



		write_nic_word(dev, RFPinsOutput, oval|bit|rw| BB_HOST_BANG_CLK); udelay(2);

		write_nic_word(dev, RFPinsOutput, oval|bit|rw| BB_HOST_BANG_CLK); udelay(2);

		write_nic_word(dev, RFPinsOutput,

				oval | bit | rw | BB_HOST_BANG_CLK);

		udelay(2);

		write_nic_word(dev, RFPinsOutput,

				oval | bit | rw | BB_HOST_BANG_CLK);

		udelay(2);



		write_nic_word(dev, RFPinsOutput, oval| bit |rw); udelay(1);

		write_nic_word(dev, RFPinsOutput, oval | bit | rw);

		udelay(1);



		mask = (low2high) ? (mask<<1) : (mask>>1);

	}



	write_nic_word(dev, RFPinsOutput, rw|oval); udelay(2);

	write_nic_word(dev, RFPinsOutput, rw|oval);

	udelay(2);

	mask = (low2high) ? 0x01 : (((u32)0x01) << (12-1));



	/*
@@ -371,9 +386,12 @@ static u32 read_rtl8225(struct net_device *dev, u8 adr) 
	for (i = 0; i < rLength; i++) {

		write_nic_word(dev, RFPinsOutput, rw|oval); udelay(1);



		write_nic_word(dev, RFPinsOutput, rw|oval|BB_HOST_BANG_CLK); udelay(2);

		write_nic_word(dev, RFPinsOutput, rw|oval|BB_HOST_BANG_CLK); udelay(2);

		write_nic_word(dev, RFPinsOutput, rw|oval|BB_HOST_BANG_CLK); udelay(2);

		write_nic_word(dev, RFPinsOutput, rw|oval|BB_HOST_BANG_CLK);

		udelay(2);

		write_nic_word(dev, RFPinsOutput, rw|oval|BB_HOST_BANG_CLK);

		udelay(2);

		write_nic_word(dev, RFPinsOutput, rw|oval|BB_HOST_BANG_CLK);

		udelay(2);

		tmp = read_nic_word(dev, RFPinsInput);



		dataRead |= (tmp & BB_HOST_BANG_CLK ? mask : 0);
@@ -383,7 +401,9 @@ static u32 read_rtl8225(struct net_device *dev, u8 adr) 
		mask = (low2high) ? (mask<<1) : (mask>>1);

	}



	write_nic_word(dev, RFPinsOutput, BB_HOST_BANG_EN|BB_HOST_BANG_RW|oval); udelay(2);

	write_nic_word(dev, RFPinsOutput,

			BB_HOST_BANG_EN | BB_HOST_BANG_RW | oval);

	udelay(2);



	write_nic_word(dev, RFPinsEnable, oval2);

	write_nic_word(dev, RFPinsSelect, oval3); /* Set To SW Switch */
@@ -486,8 +506,10 @@ void rtl8225z2_SetTXPowerLevel(struct net_device *dev, short ch) 
	if (IS_DOT11D_ENABLE(priv->ieee80211) &&

	    IS_DOT11D_STATE_DONE(priv->ieee80211)) {

		u8 MaxTxPwrInDbm = DOT11D_GetMaxTxPwrInDbm(priv->ieee80211, ch);

		u8 CckMaxPwrIdx = DbmToTxPwrIdx(priv, WIRELESS_MODE_B, MaxTxPwrInDbm);

		u8 OfdmMaxPwrIdx = DbmToTxPwrIdx(priv, WIRELESS_MODE_G, MaxTxPwrInDbm);

		u8 CckMaxPwrIdx = DbmToTxPwrIdx(priv, WIRELESS_MODE_B,

							MaxTxPwrInDbm);

		u8 OfdmMaxPwrIdx = DbmToTxPwrIdx(priv, WIRELESS_MODE_G,

							MaxTxPwrInDbm);



		if (cck_power_level > CckMaxPwrIdx)

			cck_power_level = CckMaxPwrIdx;
@@ -882,12 +904,14 @@ bool SetZebraRFPowerState8185(struct net_device *dev, 
		break;

	case eRfSleep:

		for (QueueID = 0, i = 0; QueueID < 6;) {

			if (get_curr_tx_free_desc(dev, QueueID) == priv->txringcount) {

			if (get_curr_tx_free_desc(dev, QueueID) ==

							priv->txringcount) {

				QueueID++;

				continue;

			} else {

				priv->TxPollingTimes++;

				if (priv->TxPollingTimes >= LPS_MAX_SLEEP_WAITING_TIMES_87SE) {

				if (priv->TxPollingTimes >=

					LPS_MAX_SLEEP_WAITING_TIMES_87SE) {

					bActionAllowed = false;

					break;

				} else
@@ -915,7 +939,8 @@ bool SetZebraRFPowerState8185(struct net_device *dev, 
				while (true) {

					u8 tmp24F = read_nic_byte(dev, 0x24f);



					if ((tmp24F == 0x01) || (tmp24F == 0x09)) {

					if ((tmp24F == 0x01) ||

							(tmp24F == 0x09)) {

						bTurnOffBB = true;

						break;

					} else {
@@ -935,7 +960,8 @@ bool SetZebraRFPowerState8185(struct net_device *dev, 
			if (bTurnOffBB) {

				/* turn off BB */

				u1bTmp = read_nic_byte(dev, 0x24E);

				write_nic_byte(dev, 0x24E, (u1bTmp | BIT5 | BIT6));

				write_nic_byte(dev, 0x24E,

						(u1bTmp | BIT5 | BIT6));



				/* turn off AFE PLL */

				write_nic_byte(dev, 0x54, 0xFC);
@@ -945,7 +971,8 @@ bool SetZebraRFPowerState8185(struct net_device *dev, 
		break;

	case eRfOff:

		for (QueueID = 0, i = 0; QueueID < 6;) {

			if (get_curr_tx_free_desc(dev, QueueID) == priv->txringcount) {

			if (get_curr_tx_free_desc(dev, QueueID) ==

					priv->txringcount) {

				QueueID++;

				continue;

			} else {