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/smsc911x.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/smsc/smsc911x.c')
-rw-r--r-- | drivers/net/ethernet/smsc/smsc911x.c | 7 |
1 files changed, 3 insertions, 4 deletions
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; |