rt2x00: Reduce requirement for debugfs wrapper functions

index a6c7602..62d742c 100644
@@ -74,7 +74,7 @@ static u32 rt2400pci_bbp_check(const struct rt2x00_dev *rt2x00dev)
 }
 
 static void rt2400pci_bbp_write(const struct rt2x00_dev *rt2x00dev,
-	const u8 reg_id, const u8 value)
+	const unsigned int word, const u8 value)
 {
 	u32 reg;
 

@@ -92,7 +92,7 @@ static void rt2400pci_bbp_write(const struct rt2x00_dev *rt2x00dev,
 	 */
 	reg = 0;
 	rt2x00_set_field32(&reg, BBPCSR_VALUE, value);
-	rt2x00_set_field32(&reg, BBPCSR_REGNUM, reg_id);
+	rt2x00_set_field32(&reg, BBPCSR_REGNUM, word);
 	rt2x00_set_field32(&reg, BBPCSR_BUSY, 1);
 	rt2x00_set_field32(&reg, BBPCSR_WRITE_CONTROL, 1);
 

@@ -100,7 +100,7 @@ static void rt2400pci_bbp_write(const struct rt2x00_dev *rt2x00dev,
 }
 
 static void rt2400pci_bbp_read(const struct rt2x00_dev *rt2x00dev,
-	const u8 reg_id, u8 *value)
+	const unsigned int word, u8 *value)
 {
 	u32 reg;
 

@@ -117,7 +117,7 @@ static void rt2400pci_bbp_read(const struct rt2x00_dev *rt2x00dev,
 	 * Write the request into the BBP.
 	 */
 	reg = 0;
-	rt2x00_set_field32(&reg, BBPCSR_REGNUM, reg_id);
+	rt2x00_set_field32(&reg, BBPCSR_REGNUM, word);
 	rt2x00_set_field32(&reg, BBPCSR_BUSY, 1);
 	rt2x00_set_field32(&reg, BBPCSR_WRITE_CONTROL, 0);
 

@@ -199,59 +199,35 @@ 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, void *data)
+static void rt2400pci_read_csr(const 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, void *data)
+static void rt2400pci_write_csr(const struct rt2x00_dev *rt2x00dev,
+	const unsigned int word, u32 data)
 {
-	rt2x00pci_register_write(rt2x00dev, CSR_OFFSET(word), *((u32*)data));
-}
-
-static void rt2400pci_read_eeprom(struct rt2x00_dev *rt2x00dev,
-	const unsigned int word, void *data)
-{
-	rt2x00_eeprom_read(rt2x00dev, word, data);
-}
-
-static void rt2400pci_write_eeprom(struct rt2x00_dev *rt2x00dev,
-	const unsigned int word, void *data)
-{
-	rt2x00_eeprom_write(rt2x00dev, word, *((u16*)data));
-}
-
-static void rt2400pci_read_bbp(struct rt2x00_dev *rt2x00dev,
-	const unsigned int word, void *data)
-{
-	rt2400pci_bbp_read(rt2x00dev, word, data);
-}
-
-static void rt2400pci_write_bbp(struct rt2x00_dev *rt2x00dev,
-	const unsigned int word, void *data)
-{
-	rt2400pci_bbp_write(rt2x00dev, word, *((u8*)data));
+	rt2x00pci_register_write(rt2x00dev, CSR_OFFSET(word), data);
 }
 
 static const struct rt2x00debug rt2400pci_rt2x00debug = {
 	.owner 		= THIS_MODULE,
-	.reg_csr	= {
+	.csr	= {
 		.read		= rt2400pci_read_csr,
 		.write		= rt2400pci_write_csr,
 		.word_size	= sizeof(u32),
 		.word_count	= CSR_REG_SIZE / sizeof(u32),
 	},
-	.reg_eeprom	= {
-		.read		= rt2400pci_read_eeprom,
-		.write		= rt2400pci_write_eeprom,
+	.eeprom	= {
+		.read		= rt2x00_eeprom_read,
+		.write		= rt2x00_eeprom_write,
 		.word_size	= sizeof(u16),
 		.word_count	= EEPROM_SIZE / sizeof(u16),
 	},
-	.reg_bbp	= {
-		.read		= rt2400pci_read_bbp,
-		.write		= rt2400pci_write_bbp,
+	.bbp	= {
+		.read		= rt2400pci_bbp_read,
+		.write		= rt2400pci_bbp_write,
 		.word_size	= sizeof(u8),
 		.word_count	= BBP_SIZE / sizeof(u8),
 	},

103 lines not on this page · raw message

136 lines not on this page · raw message

index bc4557d..4a71a96 100644
@@ -951,13 +951,13 @@ static inline void* rt2x00_eeprom_addr(const struct rt2x00_dev *rt2x00dev,
 }
 
 static inline void rt2x00_eeprom_read(const struct rt2x00_dev *rt2x00dev,
-	const u8 word, u16 *data)
+	const unsigned int word, u16 *data)
 {
 	*data = le16_to_cpu(rt2x00dev->eeprom[word]);
 }
 
 static inline void rt2x00_eeprom_write(const struct rt2x00_dev *rt2x00dev,
-	const u8 word, u16 data)
+	const unsigned int word, u16 data)
 {
 	rt2x00dev->eeprom[word] = cpu_to_le16(data);
 }

263 lines not on this page · raw message

index 680811c..82b4df8 100644
@@ -30,16 +30,15 @@
 
 #include <net/wireless.h>
 
-typedef void (debug_access_t)(struct rt2x00_dev *rt2x00dev,
-	const unsigned int word, void *data);
-
-struct rt2x00debug_reg {
-	debug_access_t *read;
-	debug_access_t *write;
-
-	unsigned int word_size;
-	unsigned int word_count;
-};
+#define RT2X00DEBUGFS_REGISTER_ENTRY(__name, __type)	\
+struct reg##__name {					\
+	void (*read)(const struct rt2x00_dev *rt2x00dev,\
+		const unsigned int word, __type *data);	\
+	void (*write)(const struct rt2x00_dev *rt2x00dev,\
+		const unsigned int word, __type data);	\
+	unsigned int word_size;				\
+	unsigned int word_count;			\
+} __name
 
 struct rt2x00debug {
 	/*

@@ -48,11 +47,11 @@ struct rt2x00debug {
 	struct module *owner;
 
 	/*
-	 * Register access information.
+	 * Register access entries.
 	 */
-	struct rt2x00debug_reg reg_csr;
-	struct rt2x00debug_reg reg_eeprom;
-	struct rt2x00debug_reg reg_bbp;
+	RT2X00DEBUGFS_REGISTER_ENTRY(csr, u32);
+	RT2X00DEBUGFS_REGISTER_ENTRY(eeprom, u16);
+	RT2X00DEBUGFS_REGISTER_ENTRY(bbp, u8);
 };
 
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS

103 lines not on this page · raw message

135 lines not on this page · raw message