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

Commit 743b97ca authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Remove debugfs CSR access wrappers 



Move calculation of CSR register offset into rt2x00debug.c
and remove the wrapper functions from each individual driver.
(Except rt2500usb, which still needs to wrap for the
different value type argument).

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f1617967

drivers/net/wireless/rt2x00/rt2400pci.c

+7 −16
Original line number Diff line number Diff line
@@ -188,43 +188,34 @@ static void rt2400pci_eepromregister_write(struct eeprom_93cx6 *eeprom) 
}



#ifdef CONFIG_RT2X00_LIB_DEBUGFS

#define CSR_OFFSET(__word)	( CSR_REG_BASE + ((__word) * sizeof(u32)) )



static void rt2400pci_read_csr(struct rt2x00_dev *rt2x00dev,

			       const unsigned int word, u32 *data)

{

	rt2x00pci_register_read(rt2x00dev, CSR_OFFSET(word), data);

}



static void rt2400pci_write_csr(struct rt2x00_dev *rt2x00dev,

				const unsigned int word, u32 data)

{

	rt2x00pci_register_write(rt2x00dev, CSR_OFFSET(word), data);

}



static const struct rt2x00debug rt2400pci_rt2x00debug = {

	.owner	= THIS_MODULE,

	.csr	= {

		.read		= rt2400pci_read_csr,

		.write		= rt2400pci_write_csr,

		.read		= rt2x00pci_register_read,

		.write		= rt2x00pci_register_write,

		.flags		= RT2X00DEBUGFS_OFFSET,

		.word_base	= CSR_REG_BASE,

		.word_size	= sizeof(u32),

		.word_count	= CSR_REG_SIZE / sizeof(u32),

	},

	.eeprom	= {

		.read		= rt2x00_eeprom_read,

		.write		= rt2x00_eeprom_write,

		.word_base	= EEPROM_BASE,

		.word_size	= sizeof(u16),

		.word_count	= EEPROM_SIZE / sizeof(u16),

	},

	.bbp	= {

		.read		= rt2400pci_bbp_read,

		.write		= rt2400pci_bbp_write,

		.word_base	= BBP_BASE,

		.word_size	= sizeof(u8),

		.word_count	= BBP_SIZE / sizeof(u8),

	},

	.rf	= {

		.read		= rt2x00_rf_read,

		.write		= rt2400pci_rf_write,

		.word_base	= RF_BASE,

		.word_size	= sizeof(u32),

		.word_count	= RF_SIZE / sizeof(u32),

	},

drivers/net/wireless/rt2x00/rt2400pci.h

+2 −0
Original line number Diff line number Diff line
@@ -46,7 +46,9 @@ 
#define CSR_REG_SIZE			0x014c

#define EEPROM_BASE			0x0000

#define EEPROM_SIZE			0x0100

#define BBP_BASE			0x0000

#define BBP_SIZE			0x0020

#define RF_BASE				0x0000

#define RF_SIZE				0x0010



/*

drivers/net/wireless/rt2x00/rt2500pci.c

+7 −16
Original line number Diff line number Diff line
@@ -188,43 +188,34 @@ static void rt2500pci_eepromregister_write(struct eeprom_93cx6 *eeprom) 
}



#ifdef CONFIG_RT2X00_LIB_DEBUGFS

#define CSR_OFFSET(__word)	( CSR_REG_BASE + ((__word) * sizeof(u32)) )



static void rt2500pci_read_csr(struct rt2x00_dev *rt2x00dev,

			       const unsigned int word, u32 *data)

{

	rt2x00pci_register_read(rt2x00dev, CSR_OFFSET(word), data);

}



static void rt2500pci_write_csr(struct rt2x00_dev *rt2x00dev,

				const unsigned int word, u32 data)

{

	rt2x00pci_register_write(rt2x00dev, CSR_OFFSET(word), data);

}



static const struct rt2x00debug rt2500pci_rt2x00debug = {

	.owner	= THIS_MODULE,

	.csr	= {

		.read		= rt2500pci_read_csr,

		.write		= rt2500pci_write_csr,

		.read		= rt2x00pci_register_read,

		.write		= rt2x00pci_register_write,

		.flags		= RT2X00DEBUGFS_OFFSET,

		.word_base	= CSR_REG_BASE,

		.word_size	= sizeof(u32),

		.word_count	= CSR_REG_SIZE / sizeof(u32),

	},

	.eeprom	= {

		.read		= rt2x00_eeprom_read,

		.write		= rt2x00_eeprom_write,

		.word_base	= EEPROM_BASE,

		.word_size	= sizeof(u16),

		.word_count	= EEPROM_SIZE / sizeof(u16),

	},

	.bbp	= {

		.read		= rt2500pci_bbp_read,

		.write		= rt2500pci_bbp_write,

		.word_base	= BBP_BASE,

		.word_size	= sizeof(u8),

		.word_count	= BBP_SIZE / sizeof(u8),

	},

	.rf	= {

		.read		= rt2x00_rf_read,

		.write		= rt2500pci_rf_write,

		.word_base	= RF_BASE,

		.word_size	= sizeof(u32),

		.word_count	= RF_SIZE / sizeof(u32),

	},

drivers/net/wireless/rt2x00/rt2500pci.h

+2 −0
Original line number Diff line number Diff line
@@ -57,7 +57,9 @@ 
#define CSR_REG_SIZE			0x0174

#define EEPROM_BASE			0x0000

#define EEPROM_SIZE			0x0200

#define BBP_BASE			0x0000

#define BBP_SIZE			0x0040

#define RF_BASE				0x0000

#define RF_SIZE				0x0014



/*

drivers/net/wireless/rt2x00/rt2500usb.c

+15 −10
Original line number Diff line number Diff line
@@ -245,43 +245,48 @@ static void rt2500usb_rf_write(struct rt2x00_dev *rt2x00dev, 
}



#ifdef CONFIG_RT2X00_LIB_DEBUGFS

#define CSR_OFFSET(__word)	( CSR_REG_BASE + ((__word) * sizeof(u16)) )



static void rt2500usb_read_csr(struct rt2x00_dev *rt2x00dev,

			       const unsigned int word, u32 *data)

static void _rt2500usb_register_read(struct rt2x00_dev *rt2x00dev,

				     const unsigned int offset,

				     u32 *value)

{

	rt2500usb_register_read(rt2x00dev, CSR_OFFSET(word), (u16 *) data);

	rt2500usb_register_read(rt2x00dev, offset, (u16 *)value);

}



static void rt2500usb_write_csr(struct rt2x00_dev *rt2x00dev,

				const unsigned int word, u32 data)

static void _rt2500usb_register_write(struct rt2x00_dev *rt2x00dev,

				      const unsigned int offset,

				      u32 value)

{

	rt2500usb_register_write(rt2x00dev, CSR_OFFSET(word), data);

	rt2500usb_register_write(rt2x00dev, offset, value);

}



static const struct rt2x00debug rt2500usb_rt2x00debug = {

	.owner	= THIS_MODULE,

	.csr	= {

		.read		= rt2500usb_read_csr,

		.write		= rt2500usb_write_csr,

		.read		= _rt2500usb_register_read,

		.write		= _rt2500usb_register_write,

		.flags		= RT2X00DEBUGFS_OFFSET,

		.word_base	= CSR_REG_BASE,

		.word_size	= sizeof(u16),

		.word_count	= CSR_REG_SIZE / sizeof(u16),

	},

	.eeprom	= {

		.read		= rt2x00_eeprom_read,

		.write		= rt2x00_eeprom_write,

		.word_base	= EEPROM_BASE,

		.word_size	= sizeof(u16),

		.word_count	= EEPROM_SIZE / sizeof(u16),

	},

	.bbp	= {

		.read		= rt2500usb_bbp_read,

		.write		= rt2500usb_bbp_write,

		.word_base	= BBP_BASE,

		.word_size	= sizeof(u8),

		.word_count	= BBP_SIZE / sizeof(u8),

	},

	.rf	= {

		.read		= rt2x00_rf_read,

		.write		= rt2500usb_rf_write,

		.word_base	= RF_BASE,

		.word_size	= sizeof(u32),

		.word_count	= RF_SIZE / sizeof(u32),

	},