diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-11-23 21:23:36 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:04:02 -0500 |
commit | 4790654c71b250018ecc234f6b9f1ed96a55572d (patch) | |
tree | 0902dbbcc763aa51c6209b560bff97505c0849eb /drivers/net/netxen/netxen_nic_niu.c | |
parent | ba734f349d5ba02a736e2d574584c56cd21bad14 (diff) |
[netdrvr] netxen: checkpatch fixes (98% trim trailing whitespace)
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_niu.c')
-rw-r--r-- | drivers/net/netxen/netxen_nic_niu.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/net/netxen/netxen_nic_niu.c b/drivers/net/netxen/netxen_nic_niu.c index 2815689bc9af..1c852a76c80d 100644 --- a/drivers/net/netxen/netxen_nic_niu.c +++ b/drivers/net/netxen/netxen_nic_niu.c | |||
@@ -75,7 +75,7 @@ static int phy_unlock(struct netxen_adapter *adapter) | |||
75 | return 0; | 75 | return 0; |
76 | } | 76 | } |
77 | 77 | ||
78 | /* | 78 | /* |
79 | * netxen_niu_gbe_phy_read - read a register from the GbE PHY via | 79 | * netxen_niu_gbe_phy_read - read a register from the GbE PHY via |
80 | * mii management interface. | 80 | * mii management interface. |
81 | * | 81 | * |
@@ -88,7 +88,7 @@ static int phy_unlock(struct netxen_adapter *adapter) | |||
88 | * -1 on error | 88 | * -1 on error |
89 | * | 89 | * |
90 | */ | 90 | */ |
91 | int netxen_niu_gbe_phy_read(struct netxen_adapter *adapter, long reg, | 91 | int netxen_niu_gbe_phy_read(struct netxen_adapter *adapter, long reg, |
92 | __u32 * readval) | 92 | __u32 * readval) |
93 | { | 93 | { |
94 | long timeout = 0; | 94 | long timeout = 0; |
@@ -171,7 +171,7 @@ int netxen_niu_gbe_phy_read(struct netxen_adapter *adapter, long reg, | |||
171 | return result; | 171 | return result; |
172 | } | 172 | } |
173 | 173 | ||
174 | /* | 174 | /* |
175 | * netxen_niu_gbe_phy_write - write a register to the GbE PHY via | 175 | * netxen_niu_gbe_phy_write - write a register to the GbE PHY via |
176 | * mii management interface. | 176 | * mii management interface. |
177 | * | 177 | * |
@@ -184,7 +184,7 @@ int netxen_niu_gbe_phy_read(struct netxen_adapter *adapter, long reg, | |||
184 | * -1 on error | 184 | * -1 on error |
185 | * | 185 | * |
186 | */ | 186 | */ |
187 | int netxen_niu_gbe_phy_write(struct netxen_adapter *adapter, long reg, | 187 | int netxen_niu_gbe_phy_write(struct netxen_adapter *adapter, long reg, |
188 | __u32 val) | 188 | __u32 val) |
189 | { | 189 | { |
190 | long timeout = 0; | 190 | long timeout = 0; |
@@ -275,7 +275,7 @@ int netxen_niu_gbe_enable_phy_interrupts(struct netxen_adapter *adapter) | |||
275 | netxen_set_phy_int_speed_changed(enable); | 275 | netxen_set_phy_int_speed_changed(enable); |
276 | 276 | ||
277 | if (0 != | 277 | if (0 != |
278 | netxen_niu_gbe_phy_write(adapter, | 278 | netxen_niu_gbe_phy_write(adapter, |
279 | NETXEN_NIU_GB_MII_MGMT_ADDR_INT_ENABLE, | 279 | NETXEN_NIU_GB_MII_MGMT_ADDR_INT_ENABLE, |
280 | enable)) | 280 | enable)) |
281 | result = -EIO; | 281 | result = -EIO; |
@@ -312,7 +312,7 @@ static int netxen_niu_gbe_clear_phy_interrupts(struct netxen_adapter *adapter) | |||
312 | { | 312 | { |
313 | int result = 0; | 313 | int result = 0; |
314 | if (0 != | 314 | if (0 != |
315 | netxen_niu_gbe_phy_write(adapter, | 315 | netxen_niu_gbe_phy_write(adapter, |
316 | NETXEN_NIU_GB_MII_MGMT_ADDR_INT_STATUS, | 316 | NETXEN_NIU_GB_MII_MGMT_ADDR_INT_STATUS, |
317 | -EIO)) | 317 | -EIO)) |
318 | result = -EIO; | 318 | result = -EIO; |
@@ -320,7 +320,7 @@ static int netxen_niu_gbe_clear_phy_interrupts(struct netxen_adapter *adapter) | |||
320 | return result; | 320 | return result; |
321 | } | 321 | } |
322 | 322 | ||
323 | /* | 323 | /* |
324 | * netxen_niu_gbe_set_mii_mode- Set 10/100 Mbit Mode for GbE MAC | 324 | * netxen_niu_gbe_set_mii_mode- Set 10/100 Mbit Mode for GbE MAC |
325 | * | 325 | * |
326 | */ | 326 | */ |
@@ -344,9 +344,9 @@ static void netxen_niu_gbe_set_mii_mode(struct netxen_adapter *adapter, | |||
344 | NETXEN_NIU_GB_MII_MGMT_CONFIG(port), 0x7); | 344 | NETXEN_NIU_GB_MII_MGMT_CONFIG(port), 0x7); |
345 | 345 | ||
346 | if (enable) { | 346 | if (enable) { |
347 | /* | 347 | /* |
348 | * Do NOT enable flow control until a suitable solution for | 348 | * Do NOT enable flow control until a suitable solution for |
349 | * shutting down pause frames is found. | 349 | * shutting down pause frames is found. |
350 | */ | 350 | */ |
351 | netxen_crb_writelit_adapter(adapter, | 351 | netxen_crb_writelit_adapter(adapter, |
352 | NETXEN_NIU_GB_MAC_CONFIG_0(port), | 352 | NETXEN_NIU_GB_MAC_CONFIG_0(port), |
@@ -359,7 +359,7 @@ static void netxen_niu_gbe_set_mii_mode(struct netxen_adapter *adapter, | |||
359 | printk(KERN_ERR PFX "ERROR clearing PHY interrupts\n"); | 359 | printk(KERN_ERR PFX "ERROR clearing PHY interrupts\n"); |
360 | } | 360 | } |
361 | 361 | ||
362 | /* | 362 | /* |
363 | * netxen_niu_gbe_set_gmii_mode- Set GbE Mode for GbE MAC | 363 | * netxen_niu_gbe_set_gmii_mode- Set GbE Mode for GbE MAC |
364 | */ | 364 | */ |
365 | static void netxen_niu_gbe_set_gmii_mode(struct netxen_adapter *adapter, | 365 | static void netxen_niu_gbe_set_gmii_mode(struct netxen_adapter *adapter, |
@@ -382,9 +382,9 @@ static void netxen_niu_gbe_set_gmii_mode(struct netxen_adapter *adapter, | |||
382 | NETXEN_NIU_GB_MII_MGMT_CONFIG(port), 0x7); | 382 | NETXEN_NIU_GB_MII_MGMT_CONFIG(port), 0x7); |
383 | 383 | ||
384 | if (enable) { | 384 | if (enable) { |
385 | /* | 385 | /* |
386 | * Do NOT enable flow control until a suitable solution for | 386 | * Do NOT enable flow control until a suitable solution for |
387 | * shutting down pause frames is found. | 387 | * shutting down pause frames is found. |
388 | */ | 388 | */ |
389 | netxen_crb_writelit_adapter(adapter, | 389 | netxen_crb_writelit_adapter(adapter, |
390 | NETXEN_NIU_GB_MAC_CONFIG_0(port), | 390 | NETXEN_NIU_GB_MAC_CONFIG_0(port), |
@@ -467,7 +467,7 @@ int netxen_niu_xg_init_port(struct netxen_adapter *adapter, int port) | |||
467 | } | 467 | } |
468 | 468 | ||
469 | #if 0 | 469 | #if 0 |
470 | /* | 470 | /* |
471 | * netxen_niu_gbe_handle_phy_interrupt - Handles GbE PHY interrupts | 471 | * netxen_niu_gbe_handle_phy_interrupt - Handles GbE PHY interrupts |
472 | * @param enable 0 means don't enable the port | 472 | * @param enable 0 means don't enable the port |
473 | * 1 means enable (or re-enable) the port | 473 | * 1 means enable (or re-enable) the port |
@@ -623,7 +623,7 @@ int netxen_niu_macaddr_set(struct netxen_adapter *adapter, | |||
623 | (adapter, NETXEN_NIU_GB_STATION_ADDR_0(phy), &val, 4)) | 623 | (adapter, NETXEN_NIU_GB_STATION_ADDR_0(phy), &val, 4)) |
624 | return -2; | 624 | return -2; |
625 | 625 | ||
626 | netxen_niu_macaddr_get(adapter, | 626 | netxen_niu_macaddr_get(adapter, |
627 | (netxen_ethernet_macaddr_t *) mac_addr); | 627 | (netxen_ethernet_macaddr_t *) mac_addr); |
628 | if (memcmp(mac_addr, addr, 6) == 0) | 628 | if (memcmp(mac_addr, addr, 6) == 0) |
629 | break; | 629 | break; |
@@ -753,7 +753,7 @@ int netxen_niu_disable_xg_port(struct netxen_adapter *adapter) | |||
753 | } | 753 | } |
754 | 754 | ||
755 | /* Set promiscuous mode for a GbE interface */ | 755 | /* Set promiscuous mode for a GbE interface */ |
756 | int netxen_niu_set_promiscuous_mode(struct netxen_adapter *adapter, | 756 | int netxen_niu_set_promiscuous_mode(struct netxen_adapter *adapter, |
757 | netxen_niu_prom_mode_t mode) | 757 | netxen_niu_prom_mode_t mode) |
758 | { | 758 | { |
759 | __u32 reg; | 759 | __u32 reg; |