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/via | |
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/via')
-rw-r--r-- | drivers/net/ethernet/via/via-rhine.c | 3 | ||||
-rw-r--r-- | drivers/net/ethernet/via/via-velocity.c | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c index 53ccc5174d08..7992b3e05d3d 100644 --- a/drivers/net/ethernet/via/via-rhine.c +++ b/drivers/net/ethernet/via/via-rhine.c | |||
@@ -856,8 +856,7 @@ static const struct net_device_ops rhine_netdev_ops = { | |||
856 | #endif | 856 | #endif |
857 | }; | 857 | }; |
858 | 858 | ||
859 | static int rhine_init_one(struct pci_dev *pdev, | 859 | static int rhine_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) |
860 | const struct pci_device_id *ent) | ||
861 | { | 860 | { |
862 | struct net_device *dev; | 861 | struct net_device *dev; |
863 | struct rhine_private *rp; | 862 | struct rhine_private *rp; |
diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c index dc9edd48c933..1bc7f9fd2583 100644 --- a/drivers/net/ethernet/via/via-velocity.c +++ b/drivers/net/ethernet/via/via-velocity.c | |||
@@ -2630,9 +2630,8 @@ static const struct net_device_ops velocity_netdev_ops = { | |||
2630 | * Set up the initial velocity_info struct for the device that has been | 2630 | * Set up the initial velocity_info struct for the device that has been |
2631 | * discovered. | 2631 | * discovered. |
2632 | */ | 2632 | */ |
2633 | static void velocity_init_info(struct pci_dev *pdev, | 2633 | static void velocity_init_info(struct pci_dev *pdev, struct velocity_info *vptr, |
2634 | struct velocity_info *vptr, | 2634 | const struct velocity_info_tbl *info) |
2635 | const struct velocity_info_tbl *info) | ||
2636 | { | 2635 | { |
2637 | memset(vptr, 0, sizeof(struct velocity_info)); | 2636 | memset(vptr, 0, sizeof(struct velocity_info)); |
2638 | 2637 | ||