Skip to contentSkip to conversation

De-typedef driver

S2IO Ralf Baechle 1 participant 1 message Dec 11, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

I stomped over the s2io driver when doing an allyesconfig build for IP27 where there was a namespace collision between the IP27 code and the s2io driver which both use a nic_t. I decieded both were broken, IP27 should not export the type and s2io was a totally typedef polluted piece of code. So here's the s2io part of the fix.

I don't have an S2IO card so this is only build tested.

 drivers/net/s2io-regs.h |    6 -
 drivers/net/s2io.c      |  488 ++++++++++++++++++++++++-----------------------
 drivers/net/s2io.h      |  199 ++++++++++---------
 3 files changed, 347 insertions(+), 346 deletions(-)
drivers/net/s2io-regs.h +3 -3
index a914fef..e01bf27 100644
@@ -15,7 +15,7 @@ #define _REGS_H
 
 #define TBD 0
 
-typedef struct _XENA_dev_config {
+struct XENA_dev_config {
 /* Convention: mHAL_XXX is mask, vHAL_XXX is value */
 
 /* General Control-Status Registers */
@@ -851,9 +851,9 @@ #define SPI_CONTROL_NACK		BIT(5)
 #define SPI_CONTROL_DONE		BIT(6)
 	u64 spi_data;
 #define SPI_DATA_WRITE(data,len)	vBIT(data,0,len)
-} XENA_dev_config_t;
+};
 
-#define XENA_REG_SPACE	sizeof(XENA_dev_config_t)
+#define XENA_REG_SPACE	sizeof(struct XENA_dev_config)
 #define	XENA_EEPROM_SPACE (0x01 << 11)
 
 #endif				/* _REGS_H */
drivers/net/s2io.c +244 -244

1,493 lines not on this page · raw message

drivers/net/s2io.h +100 -99

504 lines not on this page · raw message