diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-06 09:30:56 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-12-07 14:22:22 -0500 |
commit | 1dd06ae8db716e17ec7e06244b858606edf378c0 (patch) | |
tree | ae4116a9b029ab570a58fae5275cfbb3af6a1d64 /drivers/net/ethernet/chelsio/cxgb4vf | |
parent | 45122ca26ced7fae41049326a3797a73f961db2e (diff) |
drivers/net: fix up function prototypes after __dev* removals
The __dev* removal patches for the network drivers ended up messing up
the function prototypes for a bunch of drivers. This patch fixes all of
them back up to be properly aligned.
Bonus is that this almost removes 100 lines of code, always a nice
surprise.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/chelsio/cxgb4vf')
-rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c index f866eb5e35de..0188df705719 100644 --- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | |||
@@ -2463,7 +2463,7 @@ static const struct net_device_ops cxgb4vf_netdev_ops = { | |||
2463 | * the PF Driver ... | 2463 | * the PF Driver ... |
2464 | */ | 2464 | */ |
2465 | static int cxgb4vf_pci_probe(struct pci_dev *pdev, | 2465 | static int cxgb4vf_pci_probe(struct pci_dev *pdev, |
2466 | const struct pci_device_id *ent) | 2466 | const struct pci_device_id *ent) |
2467 | { | 2467 | { |
2468 | static int version_printed; | 2468 | static int version_printed; |
2469 | 2469 | ||
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c index 9b70cccf8437..7127c7b9efde 100644 --- a/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c +++ b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | |||
@@ -253,8 +253,7 @@ static int hash_mac_addr(const u8 *addr) | |||
253 | * Initializes the SW state maintained for each link, including the link's | 253 | * Initializes the SW state maintained for each link, including the link's |
254 | * capabilities and default speed/flow-control/autonegotiation settings. | 254 | * capabilities and default speed/flow-control/autonegotiation settings. |
255 | */ | 255 | */ |
256 | static void init_link_config(struct link_config *lc, | 256 | static void init_link_config(struct link_config *lc, unsigned int caps) |
257 | unsigned int caps) | ||
258 | { | 257 | { |
259 | lc->supported = caps; | 258 | lc->supported = caps; |
260 | lc->requested_speed = 0; | 259 | lc->requested_speed = 0; |