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/smsc | |
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/smsc')
-rw-r--r-- | drivers/net/ethernet/smsc/epic100.c | 3 | ||||
-rw-r--r-- | drivers/net/ethernet/smsc/smc91x.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/smsc/smsc911x.c | 7 |
3 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/ethernet/smsc/epic100.c b/drivers/net/ethernet/smsc/epic100.c index 347cccbeb53c..03b256af7ed5 100644 --- a/drivers/net/ethernet/smsc/epic100.c +++ b/drivers/net/ethernet/smsc/epic100.c | |||
@@ -318,8 +318,7 @@ static const struct net_device_ops epic_netdev_ops = { | |||
318 | .ndo_validate_addr = eth_validate_addr, | 318 | .ndo_validate_addr = eth_validate_addr, |
319 | }; | 319 | }; |
320 | 320 | ||
321 | static int epic_init_one(struct pci_dev *pdev, | 321 | static int epic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) |
322 | const struct pci_device_id *ent) | ||
323 | { | 322 | { |
324 | static int card_idx = -1; | 323 | static int card_idx = -1; |
325 | void __iomem *ioaddr; | 324 | void __iomem *ioaddr; |
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c index b085692f3893..022b45bc14ff 100644 --- a/drivers/net/ethernet/smsc/smc91x.c +++ b/drivers/net/ethernet/smsc/smc91x.c | |||
@@ -1854,7 +1854,7 @@ static int smc_findirq(struct smc_local *lp) | |||
1854 | * o GRAB the region | 1854 | * o GRAB the region |
1855 | */ | 1855 | */ |
1856 | static int smc_probe(struct net_device *dev, void __iomem *ioaddr, | 1856 | static int smc_probe(struct net_device *dev, void __iomem *ioaddr, |
1857 | unsigned long irq_flags) | 1857 | unsigned long irq_flags) |
1858 | { | 1858 | { |
1859 | struct smc_local *lp = netdev_priv(dev); | 1859 | struct smc_local *lp = netdev_priv(dev); |
1860 | static int version_printed = 0; | 1860 | static int version_printed = 0; |
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index c52a5cefa192..39a7a49d98e0 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c | |||
@@ -1032,7 +1032,7 @@ static int smsc911x_mii_probe(struct net_device *dev) | |||
1032 | } | 1032 | } |
1033 | 1033 | ||
1034 | static int smsc911x_mii_init(struct platform_device *pdev, | 1034 | static int smsc911x_mii_init(struct platform_device *pdev, |
1035 | struct net_device *dev) | 1035 | struct net_device *dev) |
1036 | { | 1036 | { |
1037 | struct smsc911x_data *pdata = netdev_priv(dev); | 1037 | struct smsc911x_data *pdata = netdev_priv(dev); |
1038 | int err = -ENXIO, i; | 1038 | int err = -ENXIO, i; |
@@ -2296,9 +2296,8 @@ static const struct smsc911x_ops shifted_smsc911x_ops = { | |||
2296 | }; | 2296 | }; |
2297 | 2297 | ||
2298 | #ifdef CONFIG_OF | 2298 | #ifdef CONFIG_OF |
2299 | static int smsc911x_probe_config_dt( | 2299 | static int smsc911x_probe_config_dt(struct smsc911x_platform_config *config, |
2300 | struct smsc911x_platform_config *config, | 2300 | struct device_node *np) |
2301 | struct device_node *np) | ||
2302 | { | 2301 | { |
2303 | const char *mac; | 2302 | const char *mac; |
2304 | u32 width = 0; | 2303 | u32 width = 0; |