diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-13 13:24:59 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-13 13:24:59 -0400 |
commit | 6aa20a2235535605db6d6d2bd850298b2fe7f31e (patch) | |
tree | df0b855043407b831d57f2f2c271f8aab48444f4 /drivers/net/typhoon.c | |
parent | 7a291083225af6e22ffaa46b3d91cfc1a1ccaab4 (diff) |
drivers/net: Trim trailing whitespace
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/typhoon.c')
-rw-r--r-- | drivers/net/typhoon.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index 1084180205a3..03107310ea7b 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c | |||
@@ -86,7 +86,7 @@ static const int multicast_filter_limit = 32; | |||
86 | #define RESPONSE_RING_SIZE (RESPONSE_ENTRIES * sizeof(struct resp_desc)) | 86 | #define RESPONSE_RING_SIZE (RESPONSE_ENTRIES * sizeof(struct resp_desc)) |
87 | 87 | ||
88 | /* The 3XP will preload and remove 64 entries from the free buffer | 88 | /* The 3XP will preload and remove 64 entries from the free buffer |
89 | * list, and we need one entry to keep the ring from wrapping, so | 89 | * list, and we need one entry to keep the ring from wrapping, so |
90 | * to keep this a power of two, we use 128 entries. | 90 | * to keep this a power of two, we use 128 entries. |
91 | */ | 91 | */ |
92 | #define RXFREE_ENTRIES 128 | 92 | #define RXFREE_ENTRIES 128 |
@@ -269,7 +269,7 @@ struct rxbuff_ent { | |||
269 | 269 | ||
270 | struct typhoon { | 270 | struct typhoon { |
271 | /* Tx cache line section */ | 271 | /* Tx cache line section */ |
272 | struct transmit_ring txLoRing ____cacheline_aligned; | 272 | struct transmit_ring txLoRing ____cacheline_aligned; |
273 | struct pci_dev * tx_pdev; | 273 | struct pci_dev * tx_pdev; |
274 | void __iomem *tx_ioaddr; | 274 | void __iomem *tx_ioaddr; |
275 | u32 txlo_dma_addr; | 275 | u32 txlo_dma_addr; |
@@ -1071,7 +1071,7 @@ typhoon_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) | |||
1071 | } else { | 1071 | } else { |
1072 | u32 sleep_ver = xp_resp[0].parm2; | 1072 | u32 sleep_ver = xp_resp[0].parm2; |
1073 | snprintf(info->fw_version, 32, "%02x.%03x.%03x", | 1073 | snprintf(info->fw_version, 32, "%02x.%03x.%03x", |
1074 | sleep_ver >> 24, (sleep_ver >> 12) & 0xfff, | 1074 | sleep_ver >> 24, (sleep_ver >> 12) & 0xfff, |
1075 | sleep_ver & 0xfff); | 1075 | sleep_ver & 0xfff); |
1076 | } | 1076 | } |
1077 | } | 1077 | } |
@@ -2152,7 +2152,7 @@ out_sleep: | |||
2152 | goto out; | 2152 | goto out; |
2153 | } | 2153 | } |
2154 | 2154 | ||
2155 | if(typhoon_sleep(tp, PCI_D3hot, 0) < 0) | 2155 | if(typhoon_sleep(tp, PCI_D3hot, 0) < 0) |
2156 | printk(KERN_ERR "%s: unable to go back to sleep\n", dev->name); | 2156 | printk(KERN_ERR "%s: unable to go back to sleep\n", dev->name); |
2157 | 2157 | ||
2158 | out: | 2158 | out: |
@@ -2600,7 +2600,7 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
2600 | "(%u:%04x)\n", dev->name, xp_resp[0].numDesc, | 2600 | "(%u:%04x)\n", dev->name, xp_resp[0].numDesc, |
2601 | le32_to_cpu(xp_resp[0].parm2)); | 2601 | le32_to_cpu(xp_resp[0].parm2)); |
2602 | } | 2602 | } |
2603 | 2603 | ||
2604 | return 0; | 2604 | return 0; |
2605 | 2605 | ||
2606 | error_out_reset: | 2606 | error_out_reset: |