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/ibm/emac | |
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/ibm/emac')
-rw-r--r-- | drivers/net/ethernet/ibm/emac/core.c | 8 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/emac/mal.c | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c index c791ad3907b2..256bdb8e1994 100644 --- a/drivers/net/ethernet/ibm/emac/core.c +++ b/drivers/net/ethernet/ibm/emac/core.c | |||
@@ -2262,7 +2262,7 @@ struct emac_depentry { | |||
2262 | #define EMAC_DEP_COUNT 6 | 2262 | #define EMAC_DEP_COUNT 6 |
2263 | 2263 | ||
2264 | static int emac_check_deps(struct emac_instance *dev, | 2264 | static int emac_check_deps(struct emac_instance *dev, |
2265 | struct emac_depentry *deps) | 2265 | struct emac_depentry *deps) |
2266 | { | 2266 | { |
2267 | int i, there = 0; | 2267 | int i, there = 0; |
2268 | struct device_node *np; | 2268 | struct device_node *np; |
@@ -2314,8 +2314,8 @@ static void emac_put_deps(struct emac_instance *dev) | |||
2314 | of_dev_put(dev->tah_dev); | 2314 | of_dev_put(dev->tah_dev); |
2315 | } | 2315 | } |
2316 | 2316 | ||
2317 | static int emac_of_bus_notify(struct notifier_block *nb, | 2317 | static int emac_of_bus_notify(struct notifier_block *nb, unsigned long action, |
2318 | unsigned long action, void *data) | 2318 | void *data) |
2319 | { | 2319 | { |
2320 | /* We are only intereted in device addition */ | 2320 | /* We are only intereted in device addition */ |
2321 | if (action == BUS_NOTIFY_BOUND_DRIVER) | 2321 | if (action == BUS_NOTIFY_BOUND_DRIVER) |
@@ -2368,7 +2368,7 @@ static int emac_wait_deps(struct emac_instance *dev) | |||
2368 | } | 2368 | } |
2369 | 2369 | ||
2370 | static int emac_read_uint_prop(struct device_node *np, const char *name, | 2370 | static int emac_read_uint_prop(struct device_node *np, const char *name, |
2371 | u32 *val, int fatal) | 2371 | u32 *val, int fatal) |
2372 | { | 2372 | { |
2373 | int len; | 2373 | int len; |
2374 | const u32 *prop = of_get_property(np, name, &len); | 2374 | const u32 *prop = of_get_property(np, name, &len); |
diff --git a/drivers/net/ethernet/ibm/emac/mal.c b/drivers/net/ethernet/ibm/emac/mal.c index 8becaaf6eb5c..50ea12bfb579 100644 --- a/drivers/net/ethernet/ibm/emac/mal.c +++ b/drivers/net/ethernet/ibm/emac/mal.c | |||
@@ -33,8 +33,7 @@ | |||
33 | 33 | ||
34 | static int mal_count; | 34 | static int mal_count; |
35 | 35 | ||
36 | int mal_register_commac(struct mal_instance *mal, | 36 | int mal_register_commac(struct mal_instance *mal, struct mal_commac *commac) |
37 | struct mal_commac *commac) | ||
38 | { | 37 | { |
39 | unsigned long flags; | 38 | unsigned long flags; |
40 | 39 | ||