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>
This commit is contained in:
Greg Kroah-Hartman
2012-12-06 14:30:56 +00:00
committed by David S. Miller
parent 45122ca26c
commit 1dd06ae8db
107 changed files with 188 additions and 284 deletions

View File

@@ -99,7 +99,7 @@ static struct ehea_bcmc_reg_array ehea_bcmc_regs;
static int ehea_probe_adapter(struct platform_device *dev,
const struct of_device_id *id);
const struct of_device_id *id);
static int ehea_remove(struct platform_device *dev);
@@ -3258,7 +3258,7 @@ static void ehea_remove_device_sysfs(struct platform_device *dev)
}
static int ehea_probe_adapter(struct platform_device *dev,
const struct of_device_id *id)
const struct of_device_id *id)
{
struct ehea_adapter *adapter;
const u64 *adapter_handle;

View File

@@ -2262,7 +2262,7 @@ struct emac_depentry {
#define EMAC_DEP_COUNT 6
static int emac_check_deps(struct emac_instance *dev,
struct emac_depentry *deps)
struct emac_depentry *deps)
{
int i, there = 0;
struct device_node *np;
@@ -2314,8 +2314,8 @@ static void emac_put_deps(struct emac_instance *dev)
of_dev_put(dev->tah_dev);
}
static int emac_of_bus_notify(struct notifier_block *nb,
unsigned long action, void *data)
static int emac_of_bus_notify(struct notifier_block *nb, unsigned long action,
void *data)
{
/* We are only intereted in device addition */
if (action == BUS_NOTIFY_BOUND_DRIVER)
@@ -2368,7 +2368,7 @@ static int emac_wait_deps(struct emac_instance *dev)
}
static int emac_read_uint_prop(struct device_node *np, const char *name,
u32 *val, int fatal)
u32 *val, int fatal)
{
int len;
const u32 *prop = of_get_property(np, name, &len);

View File

@@ -33,8 +33,7 @@
static int mal_count;
int mal_register_commac(struct mal_instance *mal,
struct mal_commac *commac)
int mal_register_commac(struct mal_instance *mal, struct mal_commac *commac)
{
unsigned long flags;

View File

@@ -1324,8 +1324,7 @@ static const struct net_device_ops ibmveth_netdev_ops = {
#endif
};
static int ibmveth_probe(struct vio_dev *dev,
const struct vio_device_id *id)
static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id)
{
int rc, i;
struct net_device *netdev;