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/marvell/sky2.c | |
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/marvell/sky2.c')
-rw-r--r-- | drivers/net/ethernet/marvell/sky2.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index 6ddfbcae7807..3269eb38cc57 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c | |||
@@ -4741,9 +4741,8 @@ static const struct net_device_ops sky2_netdev_ops[2] = { | |||
4741 | }; | 4741 | }; |
4742 | 4742 | ||
4743 | /* Initialize network device */ | 4743 | /* Initialize network device */ |
4744 | static struct net_device *sky2_init_netdev(struct sky2_hw *hw, | 4744 | static struct net_device *sky2_init_netdev(struct sky2_hw *hw, unsigned port, |
4745 | unsigned port, | 4745 | int highmem, int wol) |
4746 | int highmem, int wol) | ||
4747 | { | 4746 | { |
4748 | struct sky2_port *sky2; | 4747 | struct sky2_port *sky2; |
4749 | struct net_device *dev = alloc_etherdev(sizeof(*sky2)); | 4748 | struct net_device *dev = alloc_etherdev(sizeof(*sky2)); |
@@ -4896,8 +4895,7 @@ static const char *sky2_name(u8 chipid, char *buf, int sz) | |||
4896 | return buf; | 4895 | return buf; |
4897 | } | 4896 | } |
4898 | 4897 | ||
4899 | static int sky2_probe(struct pci_dev *pdev, | 4898 | static int sky2_probe(struct pci_dev *pdev, const struct pci_device_id *ent) |
4900 | const struct pci_device_id *ent) | ||
4901 | { | 4899 | { |
4902 | struct net_device *dev, *dev1; | 4900 | struct net_device *dev, *dev1; |
4903 | struct sky2_hw *hw; | 4901 | struct sky2_hw *hw; |