diff options
author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-06 18:19:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 19:57:58 -0400 |
commit | b6158d23a60ac32fc08316703266b6ab14d9dc00 (patch) | |
tree | c83fa6243d508aee6036fda9e0bfddc4231fc203 /drivers/net/irda | |
parent | a956f4ca3ede0a77e307f504e4a98554047b44ff (diff) |
[PATCH] smsc-ircc2: remove typedefs
IRDA: smsc-ircc2 - remove excessive typedefs.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Cc: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/net/irda')
-rw-r--r-- | drivers/net/irda/smsc-ircc2.c | 39 |
1 files changed, 13 insertions, 26 deletions
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c index a5090ddb0d0f..6c6747d2b00d 100644 --- a/drivers/net/irda/smsc-ircc2.c +++ b/drivers/net/irda/smsc-ircc2.c | |||
@@ -105,17 +105,6 @@ struct smsc_transceiver { | |||
105 | void (*set_for_speed)(int fir_base, u32 speed); | 105 | void (*set_for_speed)(int fir_base, u32 speed); |
106 | int (*probe)(int fir_base); | 106 | int (*probe)(int fir_base); |
107 | }; | 107 | }; |
108 | typedef struct smsc_transceiver smsc_transceiver_t; | ||
109 | |||
110 | #if 0 | ||
111 | struct smc_chip { | ||
112 | char *name; | ||
113 | u16 flags; | ||
114 | u8 devid; | ||
115 | u8 rev; | ||
116 | }; | ||
117 | typedef struct smc_chip smc_chip_t; | ||
118 | #endif | ||
119 | 108 | ||
120 | struct smsc_chip { | 109 | struct smsc_chip { |
121 | char *name; | 110 | char *name; |
@@ -126,13 +115,11 @@ struct smsc_chip { | |||
126 | u8 devid; | 115 | u8 devid; |
127 | u8 rev; | 116 | u8 rev; |
128 | }; | 117 | }; |
129 | typedef struct smsc_chip smsc_chip_t; | ||
130 | 118 | ||
131 | struct smsc_chip_address { | 119 | struct smsc_chip_address { |
132 | unsigned int cfg_base; | 120 | unsigned int cfg_base; |
133 | unsigned int type; | 121 | unsigned int type; |
134 | }; | 122 | }; |
135 | typedef struct smsc_chip_address smsc_chip_address_t; | ||
136 | 123 | ||
137 | /* Private data for each instance */ | 124 | /* Private data for each instance */ |
138 | struct smsc_ircc_cb { | 125 | struct smsc_ircc_cb { |
@@ -208,9 +195,9 @@ static void smsc_ircc_sir_wait_hw_transmitter_finish(struct smsc_ircc_cb *self); | |||
208 | 195 | ||
209 | /* Probing */ | 196 | /* Probing */ |
210 | static int __init smsc_ircc_look_for_chips(void); | 197 | static int __init smsc_ircc_look_for_chips(void); |
211 | static const smsc_chip_t * __init smsc_ircc_probe(unsigned short cfg_base, u8 reg, const smsc_chip_t *chip, char *type); | 198 | static const struct smsc_chip * __init smsc_ircc_probe(unsigned short cfg_base, u8 reg, const struct smsc_chip *chip, char *type); |
212 | static int __init smsc_superio_flat(const smsc_chip_t *chips, unsigned short cfg_base, char *type); | 199 | static int __init smsc_superio_flat(const struct smsc_chip *chips, unsigned short cfg_base, char *type); |
213 | static int __init smsc_superio_paged(const smsc_chip_t *chips, unsigned short cfg_base, char *type); | 200 | static int __init smsc_superio_paged(const struct smsc_chip *chips, unsigned short cfg_base, char *type); |
214 | static int __init smsc_superio_fdc(unsigned short cfg_base); | 201 | static int __init smsc_superio_fdc(unsigned short cfg_base); |
215 | static int __init smsc_superio_lpc(unsigned short cfg_base); | 202 | static int __init smsc_superio_lpc(unsigned short cfg_base); |
216 | 203 | ||
@@ -232,7 +219,7 @@ static int smsc_ircc_pmproc(struct pm_dev *dev, pm_request_t rqst, void *data); | |||
232 | 219 | ||
233 | /* Transceivers for SMSC-ircc */ | 220 | /* Transceivers for SMSC-ircc */ |
234 | 221 | ||
235 | static smsc_transceiver_t smsc_transceivers[] = | 222 | static struct smsc_transceiver smsc_transceivers[] = |
236 | { | 223 | { |
237 | { "Toshiba Satellite 1800 (GP data pin select)", smsc_ircc_set_transceiver_toshiba_sat1800, smsc_ircc_probe_transceiver_toshiba_sat1800 }, | 224 | { "Toshiba Satellite 1800 (GP data pin select)", smsc_ircc_set_transceiver_toshiba_sat1800, smsc_ircc_probe_transceiver_toshiba_sat1800 }, |
238 | { "Fast pin select", smsc_ircc_set_transceiver_smsc_ircc_fast_pin_select, smsc_ircc_probe_transceiver_smsc_ircc_fast_pin_select }, | 225 | { "Fast pin select", smsc_ircc_set_transceiver_smsc_ircc_fast_pin_select, smsc_ircc_probe_transceiver_smsc_ircc_fast_pin_select }, |
@@ -250,7 +237,7 @@ static smsc_transceiver_t smsc_transceivers[] = | |||
250 | #define FIR 4 /* SuperIO Chip has fast IRDA */ | 237 | #define FIR 4 /* SuperIO Chip has fast IRDA */ |
251 | #define SERx4 8 /* SuperIO Chip supports 115,2 KBaud * 4=460,8 KBaud */ | 238 | #define SERx4 8 /* SuperIO Chip supports 115,2 KBaud * 4=460,8 KBaud */ |
252 | 239 | ||
253 | static smsc_chip_t __initdata fdc_chips_flat[] = | 240 | static struct smsc_chip __initdata fdc_chips_flat[] = |
254 | { | 241 | { |
255 | /* Base address 0x3f0 or 0x370 */ | 242 | /* Base address 0x3f0 or 0x370 */ |
256 | { "37C44", KEY55_1|NoIRDA, 0x00, 0x00 }, /* This chip cannot be detected */ | 243 | { "37C44", KEY55_1|NoIRDA, 0x00, 0x00 }, /* This chip cannot be detected */ |
@@ -264,7 +251,7 @@ static smsc_chip_t __initdata fdc_chips_flat[] = | |||
264 | { NULL } | 251 | { NULL } |
265 | }; | 252 | }; |
266 | 253 | ||
267 | static smsc_chip_t __initdata fdc_chips_paged[] = | 254 | static struct smsc_chip __initdata fdc_chips_paged[] = |
268 | { | 255 | { |
269 | /* Base address 0x3f0 or 0x370 */ | 256 | /* Base address 0x3f0 or 0x370 */ |
270 | { "37B72X", KEY55_1|SIR|SERx4, 0x4c, 0x00 }, | 257 | { "37B72X", KEY55_1|SIR|SERx4, 0x4c, 0x00 }, |
@@ -283,7 +270,7 @@ static smsc_chip_t __initdata fdc_chips_paged[] = | |||
283 | { NULL } | 270 | { NULL } |
284 | }; | 271 | }; |
285 | 272 | ||
286 | static smsc_chip_t __initdata lpc_chips_flat[] = | 273 | static struct smsc_chip __initdata lpc_chips_flat[] = |
287 | { | 274 | { |
288 | /* Base address 0x2E or 0x4E */ | 275 | /* Base address 0x2E or 0x4E */ |
289 | { "47N227", KEY55_1|FIR|SERx4, 0x5a, 0x00 }, | 276 | { "47N227", KEY55_1|FIR|SERx4, 0x5a, 0x00 }, |
@@ -291,7 +278,7 @@ static smsc_chip_t __initdata lpc_chips_flat[] = | |||
291 | { NULL } | 278 | { NULL } |
292 | }; | 279 | }; |
293 | 280 | ||
294 | static smsc_chip_t __initdata lpc_chips_paged[] = | 281 | static struct smsc_chip __initdata lpc_chips_paged[] = |
295 | { | 282 | { |
296 | /* Base address 0x2E or 0x4E */ | 283 | /* Base address 0x2E or 0x4E */ |
297 | { "47B27X", KEY55_1|SIR|SERx4, 0x51, 0x00 }, | 284 | { "47B27X", KEY55_1|SIR|SERx4, 0x51, 0x00 }, |
@@ -310,7 +297,7 @@ static smsc_chip_t __initdata lpc_chips_paged[] = | |||
310 | #define SMSCSIO_TYPE_FLAT 4 | 297 | #define SMSCSIO_TYPE_FLAT 4 |
311 | #define SMSCSIO_TYPE_PAGED 8 | 298 | #define SMSCSIO_TYPE_PAGED 8 |
312 | 299 | ||
313 | static smsc_chip_address_t __initdata possible_addresses[] = | 300 | static struct smsc_chip_address __initdata possible_addresses[] = |
314 | { | 301 | { |
315 | { 0x3f0, SMSCSIO_TYPE_FDC|SMSCSIO_TYPE_FLAT|SMSCSIO_TYPE_PAGED }, | 302 | { 0x3f0, SMSCSIO_TYPE_FDC|SMSCSIO_TYPE_FLAT|SMSCSIO_TYPE_PAGED }, |
316 | { 0x370, SMSCSIO_TYPE_FDC|SMSCSIO_TYPE_FLAT|SMSCSIO_TYPE_PAGED }, | 303 | { 0x370, SMSCSIO_TYPE_FDC|SMSCSIO_TYPE_FLAT|SMSCSIO_TYPE_PAGED }, |
@@ -2010,7 +1997,7 @@ static void smsc_ircc_sir_wait_hw_transmitter_finish(struct smsc_ircc_cb *self) | |||
2010 | 1997 | ||
2011 | static int __init smsc_ircc_look_for_chips(void) | 1998 | static int __init smsc_ircc_look_for_chips(void) |
2012 | { | 1999 | { |
2013 | smsc_chip_address_t *address; | 2000 | struct smsc_chip_address *address; |
2014 | char *type; | 2001 | char *type; |
2015 | unsigned int cfg_base, found; | 2002 | unsigned int cfg_base, found; |
2016 | 2003 | ||
@@ -2053,7 +2040,7 @@ static int __init smsc_ircc_look_for_chips(void) | |||
2053 | * Try to get configuration of a smc SuperIO chip with flat register model | 2040 | * Try to get configuration of a smc SuperIO chip with flat register model |
2054 | * | 2041 | * |
2055 | */ | 2042 | */ |
2056 | static int __init smsc_superio_flat(const smsc_chip_t *chips, unsigned short cfgbase, char *type) | 2043 | static int __init smsc_superio_flat(const struct smsc_chip *chips, unsigned short cfgbase, char *type) |
2057 | { | 2044 | { |
2058 | unsigned short firbase, sirbase; | 2045 | unsigned short firbase, sirbase; |
2059 | u8 mode, dma, irq; | 2046 | u8 mode, dma, irq; |
@@ -2104,7 +2091,7 @@ static int __init smsc_superio_flat(const smsc_chip_t *chips, unsigned short cfg | |||
2104 | * Try to get configuration of a smc SuperIO chip with paged register model | 2091 | * Try to get configuration of a smc SuperIO chip with paged register model |
2105 | * | 2092 | * |
2106 | */ | 2093 | */ |
2107 | static int __init smsc_superio_paged(const smsc_chip_t *chips, unsigned short cfg_base, char *type) | 2094 | static int __init smsc_superio_paged(const struct smsc_chip *chips, unsigned short cfg_base, char *type) |
2108 | { | 2095 | { |
2109 | unsigned short fir_io, sir_io; | 2096 | unsigned short fir_io, sir_io; |
2110 | int ret = -ENODEV; | 2097 | int ret = -ENODEV; |
@@ -2149,7 +2136,7 @@ static int __init smsc_access(unsigned short cfg_base, unsigned char reg) | |||
2149 | return inb(cfg_base) != reg ? -1 : 0; | 2136 | return inb(cfg_base) != reg ? -1 : 0; |
2150 | } | 2137 | } |
2151 | 2138 | ||
2152 | static const smsc_chip_t * __init smsc_ircc_probe(unsigned short cfg_base, u8 reg, const smsc_chip_t *chip, char *type) | 2139 | static const struct smsc_chip * __init smsc_ircc_probe(unsigned short cfg_base, u8 reg, const struct smsc_chip *chip, char *type) |
2153 | { | 2140 | { |
2154 | u8 devid, xdevid, rev; | 2141 | u8 devid, xdevid, rev; |
2155 | 2142 | ||