Commit dfd6aefb authored by Maxim Mikityanskiy's avatar Maxim Mikityanskiy Committed by Greg Kroah-Hartman
Browse files

staging: rtl8187se: Use ARRAY_SIZE instead of in-code constants 



Use ARRAY_SIZE macro instead of hardcoding array size into loop
condition and remove unused last item of rtl8225z2_rxgain[]

Signed-off-by: default avatarMaxim Mikityanskiy <maxtram95@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4dffbc3d

drivers/staging/rtl8187se/r8180_rtl8225z2.c

+9 −11
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static const u16 rtl8225z2_rxgain[] = { 
	0x0794, 0x0795, 0x0798, 0x0799, 0x079a, 0x079b, 0x079c, 0x079d,

	0x07a0, 0x07a1, 0x07a2, 0x07a3, 0x07a4, 0x07a5, 0x07a8, 0x07a9,

	0x03aa, 0x03ab, 0x03ac, 0x03ad, 0x03b0, 0x03b1, 0x03b2, 0x03b3,

	0x03b4, 0x03b5, 0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bb

	0x03b4, 0x03b5, 0x03b8, 0x03b9, 0x03ba, 0x03bb



};
@@ -432,7 +432,7 @@ void rtl8225z2_rf_init(struct net_device *dev) 
	int i;

	short channel = 1;

	u16 brsr;

	u32	data, addr;

	u32 data;



	priv->chan = channel;
@@ -473,8 +473,8 @@ void rtl8225z2_rf_init(struct net_device *dev) 


	write_rtl8225(dev, 0x0, 0x1b7);



	for (i = 0; i < 95; i++) {

		write_rtl8225(dev, 0x1, (u8)(i + 1));

	for (i = 0; i < ARRAY_SIZE(rtl8225z2_rxgain); i++) {

		write_rtl8225(dev, 0x1, i + 1);

		write_rtl8225(dev, 0x2, rtl8225z2_rxgain[i]);

	}
@@ -504,14 +504,12 @@ void rtl8225z2_rf_init(struct net_device *dev) 


	write_rtl8225(dev, 0x0, 0x2bf);



	for (i = 0; i < 128; i++) {

		data = rtl8225_agc[i];



		addr = i + 0x80; /* enable writing AGC table */

		write_phy_ofdm(dev, 0xb, data);

	for (i = 0; i < ARRAY_SIZE(rtl8225_agc); i++) {

		write_phy_ofdm(dev, 0xb, rtl8225_agc[i]);

		mdelay(1);



		write_phy_ofdm(dev, 0xa, addr);

		/* enable writing AGC table */

		write_phy_ofdm(dev, 0xa, i + 0x80);

		mdelay(1);

	}