Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drivers/net/can/mscan/mpc5xxx_can.c

+4 −8
Original line number Diff line number Diff line
@@ -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;

}

drivers/net/can/sja1000/ems_pcmcia.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

drivers/net/can/sja1000/peak_pci.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

drivers/net/can/softing/softing_cs.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/3com/3c509.c

+4 −7
Original line number Diff line number Diff line
@@ -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;