Commit 1dd06ae8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by David S. Miller
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 45122ca2
......@@ -64,7 +64,7 @@ static void c_can_pci_write_reg_aligned_to_32bit(struct c_can_priv *priv,
}
static int c_can_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *ent)
const struct pci_device_id *ent)
{
struct c_can_pci_data *c_can_pci_data = (void *)ent->driver_data;
struct c_can_priv *priv;
......
......@@ -76,7 +76,7 @@ static void cc770_platform_write_reg(const struct cc770_priv *priv, int reg,
}
static int cc770_get_of_node_data(struct platform_device *pdev,
struct cc770_priv *priv)
struct cc770_priv *priv)
{
struct device_node *np = pdev->dev.of_node;
const u32 *prop;
......@@ -149,7 +149,7 @@ static int cc770_get_of_node_data(struct platform_device *pdev,
}
static int cc770_get_platform_data(struct platform_device *pdev,
struct cc770_priv *priv)
struct cc770_priv *priv)
{
struct cc770_platform_data *pdata = pdev->dev.platform_data;
......
......@@ -49,8 +49,7 @@ static struct of_device_id mpc52xx_cdm_ids[] = {
};
static u32 mpc52xx_can_get_clock(struct platform_device *ofdev,
const char *clock_name,
int *mscan_clksrc)
const char *clock_name, int *mscan_clksrc)
{
unsigned int pvr;
struct mpc52xx_cdm __iomem *cdm;
......@@ -102,8 +101,7 @@ static u32 mpc52xx_can_get_clock(struct platform_device *ofdev,
}
#else /* !CONFIG_PPC_MPC52xx */
static u32 mpc52xx_can_get_clock(struct platform_device *ofdev,
const char *clock_name,
int *mscan_clksrc)
const char *clock_name, int *mscan_clksrc)
{
return 0;
}
......@@ -130,8 +128,7 @@ static struct of_device_id mpc512x_clock_ids[] = {
};
static u32 mpc512x_can_get_clock(struct platform_device *ofdev,
const char *clock_name,
int *mscan_clksrc)
const char *clock_name, int *mscan_clksrc)
{
struct mpc512x_clockctl __iomem *clockctl;
struct device_node *np_clock;
......@@ -240,8 +237,7 @@ exit_put:
}
#else /* !CONFIG_PPC_MPC512x */
static u32 mpc512x_can_get_clock(struct platform_device *ofdev,
const char *clock_name,
int *mscan_clksrc)
const char *clock_name, int *mscan_clksrc)
{
return 0;
}
......
......@@ -221,7 +221,7 @@ static void ems_pci_card_reset(struct ems_pci_card *card)
* CAN channel to SJA1000 Socket-CAN subsystem.
*/
static int ems_pci_add_card(struct pci_dev *pdev,
const struct pci_device_id *ent)
const struct pci_device_id *ent)
{
struct sja1000_priv *priv;
struct net_device *dev;
......
......@@ -166,8 +166,7 @@ static void ems_pcmcia_del_card(struct pcmcia_device *pdev)
* Probe PCI device for EMS CAN signature and register each available
* CAN channel to SJA1000 Socket-CAN subsystem.
*/
static int ems_pcmcia_add_card(struct pcmcia_device *pdev,
unsigned long base)
static int ems_pcmcia_add_card(struct pcmcia_device *pdev, unsigned long base)
{
struct sja1000_priv *priv;
struct net_device *dev;
......
......@@ -291,7 +291,7 @@ failure:
}
static int kvaser_pci_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent)
const struct pci_device_id *ent)
{
int err;
struct net_device *master_dev = NULL;
......
......@@ -551,8 +551,7 @@ static void peak_pci_post_irq(const struct sja1000_priv *priv)
writew(chan->icr_mask, chan->cfg_base + PITA_ICR);
}
static int peak_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *ent)
static int peak_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{
struct sja1000_priv *priv;
struct peak_pci_chan *chan;
......
......@@ -485,7 +485,7 @@ static void plx_pci_del_card(struct pci_dev *pdev)
* available CAN channel to SJA1000 Socket-CAN subsystem.
*/
static int plx_pci_add_card(struct pci_dev *pdev,
const struct pci_device_id *ent)
const struct pci_device_id *ent)
{
struct sja1000_priv *priv;
struct net_device *dev;
......
......@@ -193,8 +193,7 @@ static int softingcs_enable_irq(struct platform_device *pdev, int v)
/*
* pcmcia check
*/
static int softingcs_probe_config(struct pcmcia_device *pcmcia,
void *priv_data)
static int softingcs_probe_config(struct pcmcia_device *pcmcia, void *priv_data)
{
struct softing_platform_data *pdat = priv_data;
struct resource *pres;
......
......@@ -646,7 +646,7 @@ static const struct can_bittiming_const softing_btr_const = {
static struct net_device *softing_netdev_create(struct softing *card,
uint16_t chip_id)
uint16_t chip_id)
{
struct net_device *netdev;
struct softing_priv *priv;
......
......@@ -270,9 +270,8 @@ static int el3_isa_id_sequence(__be16 *phys_addr)
}
static void el3_dev_fill(struct net_device *dev, __be16 *phys_addr,
int ioaddr, int irq, int if_port,
enum el3_cardtype type)
static void el3_dev_fill(struct net_device *dev, __be16 *phys_addr, int ioaddr,
int irq, int if_port, enum el3_cardtype type)
{
struct el3_private *lp = netdev_priv(dev);
......@@ -283,8 +282,7 @@ static void el3_dev_fill(struct net_device *dev, __be16 *phys_addr,
lp->type = type;
}
static int el3_isa_match(struct device *pdev,
unsigned int ndev)
static int el3_isa_match(struct device *pdev, unsigned int ndev)
{
struct net_device *dev;
int ioaddr, isa_irq, if_port, err;
......@@ -406,8 +404,7 @@ static struct pnp_device_id el3_pnp_ids[] = {
};
MODULE_DEVICE_TABLE(pnp, el3_pnp_ids);
static int el3_pnp_probe(struct pnp_dev *pdev,
const struct pnp_device_id *id)
static int el3_pnp_probe(struct pnp_dev *pdev, const struct pnp_device_id *id)
{
short i;
int ioaddr, irq, if_port;
......
......@@ -1001,7 +1001,7 @@ static int __init vortex_eisa_init(void)
/* returns count (>= 0), or negative on error */
static int vortex_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent)
const struct pci_device_id *ent)
{
int rc, unit, pci_bar;
struct vortex_chip_info *vci;
......@@ -1088,9 +1088,8 @@ static const struct net_device_ops vortex_netdev_ops = {
*
* NOTE: pdev can be NULL, for the case of a Compaq device
*/
static int vortex_probe1(struct device *gendev,
void __iomem *ioaddr, int irq,
int chip_idx, int card_idx)
static int vortex_probe1(struct device *gendev, void __iomem *ioaddr, int irq,
int chip_idx, int card_idx)
{
struct vortex_private *vp;
int option;
......
......@@ -81,7 +81,7 @@ static struct zorro_driver hydra_driver = {
};
static int hydra_init_one(struct zorro_dev *z,
const struct zorro_device_id *ent)
const struct zorro_device_id *ent)
{
int err;
......
......@@ -286,9 +286,8 @@ static const struct net_device_ops zorro8390_netdev_ops = {
#endif
};
static int zorro8390_init(struct net_device *dev,
unsigned long board, const char *name,
unsigned long ioaddr)
static int zorro8390_init(struct net_device *dev, unsigned long board,
const char *name, unsigned long ioaddr)
{
int i;
int err;
......@@ -397,7 +396,7 @@ static int zorro8390_init(struct net_device *dev,
}
static int zorro8390_init_one(struct zorro_dev *z,
const struct zorro_device_id *ent)
const struct zorro_device_id *ent)
{
struct net_device *dev;
unsigned long board, ioaddr;
......
......@@ -642,7 +642,7 @@ static const struct net_device_ops netdev_ops = {
};
static int starfire_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent)
const struct pci_device_id *ent)
{
struct device *d = &pdev->dev;
struct netdev_private *np;
......
......@@ -455,7 +455,7 @@ static const struct net_device_ops ace_netdev_ops = {
};
static int acenic_probe_one(struct pci_dev *pdev,
const struct pci_device_id *id)
const struct pci_device_id *id)
{
struct net_device *dev;
struct ace_private *ap;
......@@ -2825,7 +2825,7 @@ static struct net_device_stats *ace_get_stats(struct net_device *dev)
static void ace_copy(struct ace_regs __iomem *regs, const __be32 *src,
u32 dest, int size)
u32 dest, int size)
{
void __iomem *tdest;
short tsize, i;
......@@ -3091,8 +3091,7 @@ static void eeprom_stop(struct ace_regs __iomem *regs)
/*
* Read a whole byte from the EEPROM.
*/
static int read_eeprom_byte(struct net_device *dev,
unsigned long offset)
static int read_eeprom_byte(struct net_device *dev, unsigned long offset)
{
struct ace_private *ap = netdev_priv(dev);
struct ace_regs __iomem *regs = ap->regs;
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment