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/irda | |
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/irda')
-rw-r--r-- | drivers/net/irda/smsc-ircc2.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/via-ircc.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c index 82c5f30aabab..5290952b60c2 100644 --- a/drivers/net/irda/smsc-ircc2.c +++ b/drivers/net/irda/smsc-ircc2.c | |||
@@ -377,7 +377,7 @@ static int pnp_driver_registered; | |||
377 | 377 | ||
378 | #ifdef CONFIG_PNP | 378 | #ifdef CONFIG_PNP |
379 | static int smsc_ircc_pnp_probe(struct pnp_dev *dev, | 379 | static int smsc_ircc_pnp_probe(struct pnp_dev *dev, |
380 | const struct pnp_device_id *dev_id) | 380 | const struct pnp_device_id *dev_id) |
381 | { | 381 | { |
382 | unsigned int firbase, sirbase; | 382 | unsigned int firbase, sirbase; |
383 | u8 dma, irq; | 383 | u8 dma, irq; |
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c index 63efbf4b51c8..f9033c6a888c 100644 --- a/drivers/net/irda/via-ircc.c +++ b/drivers/net/irda/via-ircc.c | |||
@@ -77,7 +77,7 @@ static int dongle_id = 0; /* default: probe */ | |||
77 | module_param(dongle_id, int, 0); | 77 | module_param(dongle_id, int, 0); |
78 | 78 | ||
79 | /* Some prototypes */ | 79 | /* Some prototypes */ |
80 | static int via_ircc_open(struct pci_dev *pdev, chipio_t * info, | 80 | static int via_ircc_open(struct pci_dev *pdev, chipio_t *info, |
81 | unsigned int id); | 81 | unsigned int id); |
82 | static int via_ircc_dma_receive(struct via_ircc_cb *self); | 82 | static int via_ircc_dma_receive(struct via_ircc_cb *self); |
83 | static int via_ircc_dma_receive_complete(struct via_ircc_cb *self, | 83 | static int via_ircc_dma_receive_complete(struct via_ircc_cb *self, |
@@ -103,7 +103,7 @@ static void hwreset(struct via_ircc_cb *self); | |||
103 | static int via_ircc_dma_xmit(struct via_ircc_cb *self, u16 iobase); | 103 | static int via_ircc_dma_xmit(struct via_ircc_cb *self, u16 iobase); |
104 | static int upload_rxdata(struct via_ircc_cb *self, int iobase); | 104 | static int upload_rxdata(struct via_ircc_cb *self, int iobase); |
105 | static int via_init_one(struct pci_dev *pcidev, const struct pci_device_id *id); | 105 | static int via_init_one(struct pci_dev *pcidev, const struct pci_device_id *id); |
106 | static void via_remove_one (struct pci_dev *pdev); | 106 | static void via_remove_one(struct pci_dev *pdev); |
107 | 107 | ||
108 | /* FIXME : Should use udelay() instead, even if we are x86 only - Jean II */ | 108 | /* FIXME : Should use udelay() instead, even if we are x86 only - Jean II */ |
109 | static void iodelay(int udelay) | 109 | static void iodelay(int udelay) |
@@ -286,8 +286,7 @@ static const struct net_device_ops via_ircc_fir_ops = { | |||
286 | * Open driver instance | 286 | * Open driver instance |
287 | * | 287 | * |
288 | */ | 288 | */ |
289 | static int via_ircc_open(struct pci_dev *pdev, chipio_t *info, | 289 | static int via_ircc_open(struct pci_dev *pdev, chipio_t *info, unsigned int id) |
290 | unsigned int id) | ||
291 | { | 290 | { |
292 | struct net_device *dev; | 291 | struct net_device *dev; |
293 | struct via_ircc_cb *self; | 292 | struct via_ircc_cb *self; |