aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/fddi
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-06 09:30:56 -0500
committerDavid S. Miller <davem@davemloft.net>2012-12-07 14:22:22 -0500
commit1dd06ae8db716e17ec7e06244b858606edf378c0 (patch)
treeae4116a9b029ab570a58fae5275cfbb3af6a1d64 /drivers/net/fddi
parent45122ca26ced7fae41049326a3797a73f961db2e (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/fddi')
-rw-r--r--drivers/net/fddi/defxx.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c
index 3c8aab70f5e7..502c8ff1d985 100644
--- a/drivers/net/fddi/defxx.c
+++ b/drivers/net/fddi/defxx.c
@@ -962,9 +962,8 @@ static void dfx_bus_config_check(DFX_board_t *bp)
962 * returning from this routine. 962 * returning from this routine.
963 */ 963 */
964 964
965static int dfx_driver_init(struct net_device *dev, 965static int dfx_driver_init(struct net_device *dev, const char *print_name,
966 const char *print_name, 966 resource_size_t bar_start)
967 resource_size_t bar_start)
968{ 967{
969 DFX_board_t *bp = netdev_priv(dev); 968 DFX_board_t *bp = netdev_priv(dev);
970 struct device *bdev = bp->bus_dev; 969 struct device *bdev = bp->bus_dev;
@@ -3623,8 +3622,7 @@ static int __maybe_unused dfx_dev_register(struct device *);
3623static int __maybe_unused dfx_dev_unregister(struct device *); 3622static int __maybe_unused dfx_dev_unregister(struct device *);
3624 3623
3625#ifdef CONFIG_PCI 3624#ifdef CONFIG_PCI
3626static int dfx_pci_register(struct pci_dev *, 3625static int dfx_pci_register(struct pci_dev *, const struct pci_device_id *);
3627 const struct pci_device_id *);
3628static void dfx_pci_unregister(struct pci_dev *); 3626static void dfx_pci_unregister(struct pci_dev *);
3629 3627
3630static DEFINE_PCI_DEVICE_TABLE(dfx_pci_table) = { 3628static DEFINE_PCI_DEVICE_TABLE(dfx_pci_table) = {
@@ -3641,7 +3639,7 @@ static struct pci_driver dfx_pci_driver = {
3641}; 3639};
3642 3640
3643static int dfx_pci_register(struct pci_dev *pdev, 3641static int dfx_pci_register(struct pci_dev *pdev,
3644 const struct pci_device_id *ent) 3642 const struct pci_device_id *ent)
3645{ 3643{
3646 return dfx_register(&pdev->dev); 3644 return dfx_register(&pdev->dev);
3647} 3645}