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:

committed by
David S. Miller

parent
45122ca26c
commit
1dd06ae8db
@@ -640,7 +640,7 @@ static void lance_set_multicast(struct net_device *dev)
|
||||
}
|
||||
|
||||
static int a2065_init_one(struct zorro_dev *z,
|
||||
const struct zorro_device_id *ent);
|
||||
const struct zorro_device_id *ent);
|
||||
static void a2065_remove_one(struct zorro_dev *z);
|
||||
|
||||
|
||||
@@ -671,7 +671,7 @@ static const struct net_device_ops lance_netdev_ops = {
|
||||
};
|
||||
|
||||
static int a2065_init_one(struct zorro_dev *z,
|
||||
const struct zorro_device_id *ent)
|
||||
const struct zorro_device_id *ent)
|
||||
{
|
||||
struct net_device *dev;
|
||||
struct lance_private *priv;
|
||||
|
@@ -711,7 +711,7 @@ static const struct net_device_ops ariadne_netdev_ops = {
|
||||
};
|
||||
|
||||
static int ariadne_init_one(struct zorro_dev *z,
|
||||
const struct zorro_device_id *ent)
|
||||
const struct zorro_device_id *ent)
|
||||
{
|
||||
unsigned long board = z->resource.start;
|
||||
unsigned long base_addr = board + ARIADNE_LANCE;
|
||||
|
@@ -46,10 +46,8 @@ struct hplance_private {
|
||||
* plus board-specific init, open and close actions.
|
||||
* Oh, and we need to tell the generic code how to read and write LANCE registers...
|
||||
*/
|
||||
static int hplance_init_one(struct dio_dev *d,
|
||||
const struct dio_device_id *ent);
|
||||
static void hplance_init(struct net_device *dev,
|
||||
struct dio_dev *d);
|
||||
static int hplance_init_one(struct dio_dev *d, const struct dio_device_id *ent);
|
||||
static void hplance_init(struct net_device *dev, struct dio_dev *d);
|
||||
static void hplance_remove_one(struct dio_dev *d);
|
||||
static void hplance_writerap(void *priv, unsigned short value);
|
||||
static void hplance_writerdp(void *priv, unsigned short value);
|
||||
@@ -83,8 +81,7 @@ static const struct net_device_ops hplance_netdev_ops = {
|
||||
};
|
||||
|
||||
/* Find all the HP Lance boards and initialise them... */
|
||||
static int hplance_init_one(struct dio_dev *d,
|
||||
const struct dio_device_id *ent)
|
||||
static int hplance_init_one(struct dio_dev *d, const struct dio_device_id *ent)
|
||||
{
|
||||
struct net_device *dev;
|
||||
int err = -ENOMEM;
|
||||
|
@@ -1305,8 +1305,8 @@ static const struct net_device_ops sparc_lance_ops = {
|
||||
};
|
||||
|
||||
static int sparc_lance_probe_one(struct platform_device *op,
|
||||
struct platform_device *ledma,
|
||||
struct platform_device *lebuffer)
|
||||
struct platform_device *ledma,
|
||||
struct platform_device *lebuffer)
|
||||
{
|
||||
struct device_node *dp = op->dev.of_node;
|
||||
static unsigned version_printed;
|
||||
|
Reference in New Issue
Block a user