diff options
author | Francois Romieu <romieu@fr.zoreil.com> | 2006-12-11 17:41:36 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-02-05 16:58:43 -0500 |
commit | b7d58394e65c7d90486026614a6ae26d82dd7756 (patch) | |
tree | f51f75b9f9c635c7cef7df65d798c74b6c17d143 | |
parent | c697f83e8c880a1e69fb2a45a6e4aa0670e10602 (diff) |
chelsio: the return statement is not a function
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
-rw-r--r-- | drivers/net/chelsio/my3126.c | 16 | ||||
-rw-r--r-- | drivers/net/chelsio/vsc7326.c | 12 |
2 files changed, 14 insertions, 14 deletions
diff --git a/drivers/net/chelsio/my3126.c b/drivers/net/chelsio/my3126.c index 82fed1dd5005..87dde3e60046 100644 --- a/drivers/net/chelsio/my3126.c +++ b/drivers/net/chelsio/my3126.c | |||
@@ -10,25 +10,25 @@ static int my3126_reset(struct cphy *cphy, int wait) | |||
10 | * This can be done through registers. It is not required since | 10 | * This can be done through registers. It is not required since |
11 | * a full chip reset is used. | 11 | * a full chip reset is used. |
12 | */ | 12 | */ |
13 | return (0); | 13 | return 0; |
14 | } | 14 | } |
15 | 15 | ||
16 | static int my3126_interrupt_enable(struct cphy *cphy) | 16 | static int my3126_interrupt_enable(struct cphy *cphy) |
17 | { | 17 | { |
18 | schedule_delayed_work(&cphy->phy_update, HZ/30); | 18 | schedule_delayed_work(&cphy->phy_update, HZ/30); |
19 | t1_tpi_read(cphy->adapter, A_ELMER0_GPO, &cphy->elmer_gpo); | 19 | t1_tpi_read(cphy->adapter, A_ELMER0_GPO, &cphy->elmer_gpo); |
20 | return (0); | 20 | return 0; |
21 | } | 21 | } |
22 | 22 | ||
23 | static int my3126_interrupt_disable(struct cphy *cphy) | 23 | static int my3126_interrupt_disable(struct cphy *cphy) |
24 | { | 24 | { |
25 | cancel_rearming_delayed_work(&cphy->phy_update); | 25 | cancel_rearming_delayed_work(&cphy->phy_update); |
26 | return (0); | 26 | return 0; |
27 | } | 27 | } |
28 | 28 | ||
29 | static int my3126_interrupt_clear(struct cphy *cphy) | 29 | static int my3126_interrupt_clear(struct cphy *cphy) |
30 | { | 30 | { |
31 | return (0); | 31 | return 0; |
32 | } | 32 | } |
33 | 33 | ||
34 | #define OFFSET(REG_ADDR) (REG_ADDR << 2) | 34 | #define OFFSET(REG_ADDR) (REG_ADDR << 2) |
@@ -102,7 +102,7 @@ static void my3216_poll(struct work_struct *work) | |||
102 | 102 | ||
103 | static int my3126_set_loopback(struct cphy *cphy, int on) | 103 | static int my3126_set_loopback(struct cphy *cphy, int on) |
104 | { | 104 | { |
105 | return (0); | 105 | return 0; |
106 | } | 106 | } |
107 | 107 | ||
108 | /* To check the activity LED */ | 108 | /* To check the activity LED */ |
@@ -146,7 +146,7 @@ static int my3126_get_link_status(struct cphy *cphy, | |||
146 | if (fc) | 146 | if (fc) |
147 | *fc = PAUSE_RX | PAUSE_TX; | 147 | *fc = PAUSE_RX | PAUSE_TX; |
148 | 148 | ||
149 | return (0); | 149 | return 0; |
150 | } | 150 | } |
151 | 151 | ||
152 | static void my3126_destroy(struct cphy *cphy) | 152 | static void my3126_destroy(struct cphy *cphy) |
@@ -177,7 +177,7 @@ static struct cphy *my3126_phy_create(adapter_t *adapter, | |||
177 | INIT_DELAYED_WORK(&cphy->phy_update, my3216_poll); | 177 | INIT_DELAYED_WORK(&cphy->phy_update, my3216_poll); |
178 | cphy->bmsr = 0; | 178 | cphy->bmsr = 0; |
179 | 179 | ||
180 | return (cphy); | 180 | return cphy; |
181 | } | 181 | } |
182 | 182 | ||
183 | /* Chip Reset */ | 183 | /* Chip Reset */ |
@@ -198,7 +198,7 @@ static int my3126_phy_reset(adapter_t * adapter) | |||
198 | val |= 0x8000; | 198 | val |= 0x8000; |
199 | t1_tpi_write(adapter, A_ELMER0_GPO, val); | 199 | t1_tpi_write(adapter, A_ELMER0_GPO, val); |
200 | udelay(100); | 200 | udelay(100); |
201 | return (0); | 201 | return 0; |
202 | } | 202 | } |
203 | 203 | ||
204 | struct gphy t1_my3126_ops = { | 204 | struct gphy t1_my3126_ops = { |
diff --git a/drivers/net/chelsio/vsc7326.c b/drivers/net/chelsio/vsc7326.c index 335544132ee3..8c4a31e20e21 100644 --- a/drivers/net/chelsio/vsc7326.c +++ b/drivers/net/chelsio/vsc7326.c | |||
@@ -256,7 +256,7 @@ static int bist_rd(adapter_t *adapter, int moduleid, int address) | |||
256 | else if((result & (1<<8)) != 0x0) | 256 | else if((result & (1<<8)) != 0x0) |
257 | CH_ERR("bist read error: 0x%x\n", result); | 257 | CH_ERR("bist read error: 0x%x\n", result); |
258 | 258 | ||
259 | return(result & 0xff); | 259 | return (result & 0xff); |
260 | } | 260 | } |
261 | 261 | ||
262 | static int bist_wr(adapter_t *adapter, int moduleid, int address, int value) | 262 | static int bist_wr(adapter_t *adapter, int moduleid, int address, int value) |
@@ -286,7 +286,7 @@ static int bist_wr(adapter_t *adapter, int moduleid, int address, int value) | |||
286 | else if((result & (1<<26)) != 0x0) | 286 | else if((result & (1<<26)) != 0x0) |
287 | CH_ERR("bist write error: 0x%x\n", result); | 287 | CH_ERR("bist write error: 0x%x\n", result); |
288 | 288 | ||
289 | return(0); | 289 | return 0; |
290 | } | 290 | } |
291 | 291 | ||
292 | static int run_bist(adapter_t *adapter, int moduleid) | 292 | static int run_bist(adapter_t *adapter, int moduleid) |
@@ -295,7 +295,7 @@ static int run_bist(adapter_t *adapter, int moduleid) | |||
295 | (void) bist_wr(adapter,moduleid, 0x00, 0x02); | 295 | (void) bist_wr(adapter,moduleid, 0x00, 0x02); |
296 | (void) bist_wr(adapter,moduleid, 0x01, 0x01); | 296 | (void) bist_wr(adapter,moduleid, 0x01, 0x01); |
297 | 297 | ||
298 | return(0); | 298 | return 0; |
299 | } | 299 | } |
300 | 300 | ||
301 | static int check_bist(adapter_t *adapter, int moduleid) | 301 | static int check_bist(adapter_t *adapter, int moduleid) |
@@ -309,14 +309,14 @@ static int check_bist(adapter_t *adapter, int moduleid) | |||
309 | if ((result & 3) != 0x3) | 309 | if ((result & 3) != 0x3) |
310 | CH_ERR("Result: 0x%x BIST error in ram %d, column: 0x%04x\n", | 310 | CH_ERR("Result: 0x%x BIST error in ram %d, column: 0x%04x\n", |
311 | result, moduleid, column); | 311 | result, moduleid, column); |
312 | return(0); | 312 | return 0; |
313 | } | 313 | } |
314 | 314 | ||
315 | static int enable_mem(adapter_t *adapter, int moduleid) | 315 | static int enable_mem(adapter_t *adapter, int moduleid) |
316 | { | 316 | { |
317 | /*enable mem*/ | 317 | /*enable mem*/ |
318 | (void) bist_wr(adapter,moduleid, 0x00, 0x00); | 318 | (void) bist_wr(adapter,moduleid, 0x00, 0x00); |
319 | return(0); | 319 | return 0; |
320 | } | 320 | } |
321 | 321 | ||
322 | static int run_bist_all(adapter_t *adapter) | 322 | static int run_bist_all(adapter_t *adapter) |
@@ -358,7 +358,7 @@ static int run_bist_all(adapter_t *adapter) | |||
358 | udelay(300); | 358 | udelay(300); |
359 | vsc_write(adapter, REG_MEM_BIST, 0x0); | 359 | vsc_write(adapter, REG_MEM_BIST, 0x0); |
360 | mdelay(10); | 360 | mdelay(10); |
361 | return(0); | 361 | return 0; |
362 | } | 362 | } |
363 | 363 | ||
364 | static int mac_intr_handler(struct cmac *mac) | 364 | static int mac_intr_handler(struct cmac *mac) |