aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/natsemi
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-06 09:30:56 -0500
committerDavid S. Miller <davem@davemloft.net>2012-12-07 14:22:22 -0500
commit1dd06ae8db716e17ec7e06244b858606edf378c0 (patch)
treeae4116a9b029ab570a58fae5275cfbb3af6a1d64 /drivers/net/ethernet/natsemi
parent45122ca26ced7fae41049326a3797a73f961db2e (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/natsemi')
-rw-r--r--drivers/net/ethernet/natsemi/macsonic.c3
-rw-r--r--drivers/net/ethernet/natsemi/natsemi.c3
-rw-r--r--drivers/net/ethernet/natsemi/ns83820.c2
3 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/ethernet/natsemi/macsonic.c b/drivers/net/ethernet/natsemi/macsonic.c
index eaddbb7c24ab..0ffde69c8d01 100644
--- a/drivers/net/ethernet/natsemi/macsonic.c
+++ b/drivers/net/ethernet/natsemi/macsonic.c
@@ -421,8 +421,7 @@ static int mac_onboard_sonic_probe(struct net_device *dev)
421} 421}
422 422
423static int mac_nubus_sonic_ethernet_addr(struct net_device *dev, 423static int mac_nubus_sonic_ethernet_addr(struct net_device *dev,
424 unsigned long prom_addr, 424 unsigned long prom_addr, int id)
425 int id)
426{ 425{
427 int i; 426 int i;
428 for(i = 0; i < 6; i++) 427 for(i = 0; i < 6; i++)
diff --git a/drivers/net/ethernet/natsemi/natsemi.c b/drivers/net/ethernet/natsemi/natsemi.c
index 77f7cd37ad30..f4ad60c97eae 100644
--- a/drivers/net/ethernet/natsemi/natsemi.c
+++ b/drivers/net/ethernet/natsemi/natsemi.c
@@ -797,8 +797,7 @@ static const struct net_device_ops natsemi_netdev_ops = {
797#endif 797#endif
798}; 798};
799 799
800static int natsemi_probe1(struct pci_dev *pdev, 800static int natsemi_probe1(struct pci_dev *pdev, const struct pci_device_id *ent)
801 const struct pci_device_id *ent)
802{ 801{
803 struct net_device *dev; 802 struct net_device *dev;
804 struct netdev_private *np; 803 struct netdev_private *np;
diff --git a/drivers/net/ethernet/natsemi/ns83820.c b/drivers/net/ethernet/natsemi/ns83820.c
index 0281755200a7..77c070de621e 100644
--- a/drivers/net/ethernet/natsemi/ns83820.c
+++ b/drivers/net/ethernet/natsemi/ns83820.c
@@ -1942,7 +1942,7 @@ static const struct net_device_ops netdev_ops = {
1942}; 1942};
1943 1943
1944static int ns83820_init_one(struct pci_dev *pci_dev, 1944static int ns83820_init_one(struct pci_dev *pci_dev,
1945 const struct pci_device_id *id) 1945 const struct pci_device_id *id)
1946{ 1946{
1947 struct net_device *ndev; 1947 struct net_device *ndev;
1948 struct ns83820 *dev; 1948 struct ns83820 *dev;