Commit aea8baa1 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Kalle Valo
Browse files

rt2x00: convert rt2x00_rf_read return type 



This is a semi-automated conversion to change rt2x00_rf_read()
to return the register contents instead of passing them by value,
resulting in much better object code. The majority of the patch
was done using:

sed -i 's:\(\<rt2x00_rf_read\>(.*, .*\), &\(.*\));:\2 = \1);:' \
	drivers/net/wireless/ralink/rt2x00/rt*

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 16d571bb

drivers/net/wireless/ralink/rt2x00/rt2400pci.c

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static const struct rt2x00debug rt2400pci_rt2x00debug = { 
		.word_count	= BBP_SIZE / sizeof(u8),

	},

	.rf	= {

		.read		= _rt2x00_rf_read,

		.read		= rt2x00_rf_read,

		.write		= rt2400pci_rf_write,

		.word_base	= RF_BASE,

		.word_size	= sizeof(u32),

drivers/net/wireless/ralink/rt2x00/rt2500pci.c

+2 −2
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static const struct rt2x00debug rt2500pci_rt2x00debug = { 
		.word_count	= BBP_SIZE / sizeof(u8),

	},

	.rf	= {

		.read		= _rt2x00_rf_read,

		.read		= rt2x00_rf_read,

		.write		= rt2500pci_rf_write,

		.word_base	= RF_BASE,

		.word_size	= sizeof(u32),
@@ -556,7 +556,7 @@ static void rt2500pci_config_txpower(struct rt2x00_dev *rt2x00dev, 
{

	u32 rf3;



	rt2x00_rf_read(rt2x00dev, 3, &rf3);

	rf3 = rt2x00_rf_read(rt2x00dev, 3);

	rt2x00_set_field32(&rf3, RF3_TXPOWER, TXPOWER_TO_DEV(txpower));

	rt2500pci_rf_write(rt2x00dev, 3, rf3);

}

drivers/net/wireless/ralink/rt2x00/rt2500usb.c

+2 −2
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ static const struct rt2x00debug rt2500usb_rt2x00debug = { 
		.word_count	= BBP_SIZE / sizeof(u8),

	},

	.rf	= {

		.read		= _rt2x00_rf_read,

		.read		= rt2x00_rf_read,

		.write		= rt2500usb_rf_write,

		.word_base	= RF_BASE,

		.word_size	= sizeof(u32),
@@ -639,7 +639,7 @@ static void rt2500usb_config_txpower(struct rt2x00_dev *rt2x00dev, 
{

	u32 rf3;



	rt2x00_rf_read(rt2x00dev, 3, &rf3);

	rf3 = rt2x00_rf_read(rt2x00dev, 3);

	rt2x00_set_field32(&rf3, RF3_TXPOWER, TXPOWER_TO_DEV(txpower));

	rt2500usb_rf_write(rt2x00dev, 3, rf3);

}

drivers/net/wireless/ralink/rt2x00/rt2800lib.c

+1 −1
Original line number Diff line number Diff line
@@ -1265,7 +1265,7 @@ const struct rt2x00debug rt2800_rt2x00debug = { 
		.word_count	= BBP_SIZE / sizeof(u8),

	},

	.rf	= {

		.read		= _rt2x00_rf_read,

		.read		= rt2x00_rf_read,

		.write		= rt2800_rf_write,

		.word_base	= RF_BASE,

		.word_size	= sizeof(u32),

drivers/net/wireless/ralink/rt2x00/rt2x00.h

+2 −9
Original line number Diff line number Diff line
@@ -1049,14 +1049,7 @@ struct rt2x00_bar_list_entry { 
 * Generic RF access.

 * The RF is being accessed by word index.

 */

static inline void rt2x00_rf_read(struct rt2x00_dev *rt2x00dev,

				  const unsigned int word, u32 *data)

{

	BUG_ON(word < 1 || word > rt2x00dev->ops->rf_size / sizeof(u32));

	*data = rt2x00dev->rf[word - 1];

}



static inline u32 _rt2x00_rf_read(struct rt2x00_dev *rt2x00dev,

static inline u32 rt2x00_rf_read(struct rt2x00_dev *rt2x00dev,

				 const unsigned int word)

{

	BUG_ON(word < 1 || word > rt2x00dev->ops->rf_size / sizeof(u32));

CRA Git | Maintained and supported by SUSTech CRA and CCSE