diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-06 09:30:56 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-12-07 14:22:22 -0500 |
commit | 1dd06ae8db716e17ec7e06244b858606edf378c0 (patch) | |
tree | ae4116a9b029ab570a58fae5275cfbb3af6a1d64 /drivers/net/wan | |
parent | 45122ca26ced7fae41049326a3797a73f961db2e (diff) |
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>
Diffstat (limited to 'drivers/net/wan')
-rw-r--r-- | drivers/net/wan/dscc4.c | 3 | ||||
-rw-r--r-- | drivers/net/wan/hd64570.c | 3 | ||||
-rw-r--r-- | drivers/net/wan/hd64572.c | 3 | ||||
-rw-r--r-- | drivers/net/wan/lmc/lmc_main.c | 3 | ||||
-rw-r--r-- | drivers/net/wan/pc300too.c | 2 | ||||
-rw-r--r-- | drivers/net/wan/pci200syn.c | 2 | ||||
-rw-r--r-- | drivers/net/wan/wanxl.c | 2 |
7 files changed, 7 insertions, 11 deletions
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c index d50223050cf4..851dc7b7e8b0 100644 --- a/drivers/net/wan/dscc4.c +++ b/drivers/net/wan/dscc4.c | |||
@@ -707,8 +707,7 @@ static void dscc4_free1(struct pci_dev *pdev) | |||
707 | kfree(ppriv); | 707 | kfree(ppriv); |
708 | } | 708 | } |
709 | 709 | ||
710 | static int dscc4_init_one(struct pci_dev *pdev, | 710 | static int dscc4_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) |
711 | const struct pci_device_id *ent) | ||
712 | { | 711 | { |
713 | struct dscc4_pci_priv *priv; | 712 | struct dscc4_pci_priv *priv; |
714 | struct dscc4_dev_priv *dpriv; | 713 | struct dscc4_dev_priv *dpriv; |
diff --git a/drivers/net/wan/hd64570.c b/drivers/net/wan/hd64570.c index c6e1a4b9e4fb..62f01b74cbd6 100644 --- a/drivers/net/wan/hd64570.c +++ b/drivers/net/wan/hd64570.c | |||
@@ -676,8 +676,7 @@ static netdev_tx_t sca_xmit(struct sk_buff *skb, struct net_device *dev) | |||
676 | 676 | ||
677 | 677 | ||
678 | #ifdef NEED_DETECT_RAM | 678 | #ifdef NEED_DETECT_RAM |
679 | static u32 sca_detect_ram(card_t *card, u8 __iomem *rambase, | 679 | static u32 sca_detect_ram(card_t *card, u8 __iomem *rambase, u32 ramsize) |
680 | u32 ramsize) | ||
681 | { | 680 | { |
682 | /* Round RAM size to 32 bits, fill from end to start */ | 681 | /* Round RAM size to 32 bits, fill from end to start */ |
683 | u32 i = ramsize &= ~3; | 682 | u32 i = ramsize &= ~3; |
diff --git a/drivers/net/wan/hd64572.c b/drivers/net/wan/hd64572.c index f1685d9624c8..6269a09c7369 100644 --- a/drivers/net/wan/hd64572.c +++ b/drivers/net/wan/hd64572.c | |||
@@ -605,8 +605,7 @@ static netdev_tx_t sca_xmit(struct sk_buff *skb, struct net_device *dev) | |||
605 | } | 605 | } |
606 | 606 | ||
607 | 607 | ||
608 | static u32 sca_detect_ram(card_t *card, u8 __iomem *rambase, | 608 | static u32 sca_detect_ram(card_t *card, u8 __iomem *rambase, u32 ramsize) |
609 | u32 ramsize) | ||
610 | { | 609 | { |
611 | /* Round RAM size to 32 bits, fill from end to start */ | 610 | /* Round RAM size to 32 bits, fill from end to start */ |
612 | u32 i = ramsize &= ~3; | 611 | u32 i = ramsize &= ~3; |
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c index 0e443fd0803b..7ef435bab425 100644 --- a/drivers/net/wan/lmc/lmc_main.c +++ b/drivers/net/wan/lmc/lmc_main.c | |||
@@ -816,8 +816,7 @@ static const struct net_device_ops lmc_ops = { | |||
816 | .ndo_get_stats = lmc_get_stats, | 816 | .ndo_get_stats = lmc_get_stats, |
817 | }; | 817 | }; |
818 | 818 | ||
819 | static int lmc_init_one(struct pci_dev *pdev, | 819 | static int lmc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) |
820 | const struct pci_device_id *ent) | ||
821 | { | 820 | { |
822 | lmc_softc_t *sc; | 821 | lmc_softc_t *sc; |
823 | struct net_device *dev; | 822 | struct net_device *dev; |
diff --git a/drivers/net/wan/pc300too.c b/drivers/net/wan/pc300too.c index a51cfa7c6540..53efc57fcace 100644 --- a/drivers/net/wan/pc300too.c +++ b/drivers/net/wan/pc300too.c | |||
@@ -298,7 +298,7 @@ static const struct net_device_ops pc300_ops = { | |||
298 | }; | 298 | }; |
299 | 299 | ||
300 | static int pc300_pci_init_one(struct pci_dev *pdev, | 300 | static int pc300_pci_init_one(struct pci_dev *pdev, |
301 | const struct pci_device_id *ent) | 301 | const struct pci_device_id *ent) |
302 | { | 302 | { |
303 | card_t *card; | 303 | card_t *card; |
304 | u32 __iomem *p; | 304 | u32 __iomem *p; |
diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c index 037c423a6328..ddbce54040e2 100644 --- a/drivers/net/wan/pci200syn.c +++ b/drivers/net/wan/pci200syn.c | |||
@@ -277,7 +277,7 @@ static const struct net_device_ops pci200_ops = { | |||
277 | }; | 277 | }; |
278 | 278 | ||
279 | static int pci200_pci_init_one(struct pci_dev *pdev, | 279 | static int pci200_pci_init_one(struct pci_dev *pdev, |
280 | const struct pci_device_id *ent) | 280 | const struct pci_device_id *ent) |
281 | { | 281 | { |
282 | card_t *card; | 282 | card_t *card; |
283 | u32 __iomem *p; | 283 | u32 __iomem *p; |
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c index b72be1280361..6a24a5a70cc7 100644 --- a/drivers/net/wan/wanxl.c +++ b/drivers/net/wan/wanxl.c | |||
@@ -558,7 +558,7 @@ static const struct net_device_ops wanxl_ops = { | |||
558 | }; | 558 | }; |
559 | 559 | ||
560 | static int wanxl_pci_init_one(struct pci_dev *pdev, | 560 | static int wanxl_pci_init_one(struct pci_dev *pdev, |
561 | const struct pci_device_id *ent) | 561 | const struct pci_device_id *ent) |
562 | { | 562 | { |
563 | card_t *card; | 563 | card_t *card; |
564 | u32 ramsize, stat; | 564 | u32 ramsize, stat; |