sugar/linux
1
0
Fork 0
Code Activity

drivers/net: fix up function prototypes after __dev* removals

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/can/sja1000/ems_pci.c
View File

@@ -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;

3
drivers/net/can/sja1000/ems_pcmcia.c
View File

@@ -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;

2
drivers/net/can/sja1000/kvaser_pci.c
View File

@@ -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;

3
drivers/net/can/sja1000/peak_pci.c
View File

@@ -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;

2
drivers/net/can/sja1000/plx_pci.c
View File

@@ -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;