aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/qlogic
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/ethernet/qlogic
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/ethernet/qlogic')
-rw-r--r--drivers/net/ethernet/qlogic/qla3xxx.c2
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c3
-rw-r--r--drivers/net/ethernet/qlogic/qlge/qlge_main.c6
3 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c
index df6eb27fa101..67a679aaf29a 100644
--- a/drivers/net/ethernet/qlogic/qla3xxx.c
+++ b/drivers/net/ethernet/qlogic/qla3xxx.c
@@ -3770,7 +3770,7 @@ static const struct net_device_ops ql3xxx_netdev_ops = {
3770}; 3770};
3771 3771
3772static int ql3xxx_probe(struct pci_dev *pdev, 3772static int ql3xxx_probe(struct pci_dev *pdev,
3773 const struct pci_device_id *pci_entry) 3773 const struct pci_device_id *pci_entry)
3774{ 3774{
3775 struct net_device *ndev = NULL; 3775 struct net_device *ndev = NULL;
3776 struct ql3_adapter *qdev = NULL; 3776 struct ql3_adapter *qdev = NULL;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 8d58092bd060..a7554d9aab0c 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -54,8 +54,7 @@ static int qlcnic_config_npars;
54module_param(qlcnic_config_npars, int, 0444); 54module_param(qlcnic_config_npars, int, 0444);
55MODULE_PARM_DESC(qlcnic_config_npars, "Configure NPARs (0=disabled, 1=enabled"); 55MODULE_PARM_DESC(qlcnic_config_npars, "Configure NPARs (0=disabled, 1=enabled");
56 56
57static int qlcnic_probe(struct pci_dev *pdev, 57static int qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
58 const struct pci_device_id *ent);
59static void qlcnic_remove(struct pci_dev *pdev); 58static void qlcnic_remove(struct pci_dev *pdev);
60static int qlcnic_open(struct net_device *netdev); 59static int qlcnic_open(struct net_device *netdev);
61static int qlcnic_close(struct net_device *netdev); 60static int qlcnic_close(struct net_device *netdev);
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index cae881c18f0b..f80cd975daed 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -4491,8 +4491,8 @@ static void ql_release_all(struct pci_dev *pdev)
4491 pci_set_drvdata(pdev, NULL); 4491 pci_set_drvdata(pdev, NULL);
4492} 4492}
4493 4493
4494static int ql_init_device(struct pci_dev *pdev, 4494static int ql_init_device(struct pci_dev *pdev, struct net_device *ndev,
4495 struct net_device *ndev, int cards_found) 4495 int cards_found)
4496{ 4496{
4497 struct ql_adapter *qdev = netdev_priv(ndev); 4497 struct ql_adapter *qdev = netdev_priv(ndev);
4498 int err = 0; 4498 int err = 0;
@@ -4657,7 +4657,7 @@ static void ql_timer(unsigned long data)
4657} 4657}
4658 4658
4659static int qlge_probe(struct pci_dev *pdev, 4659static int qlge_probe(struct pci_dev *pdev,
4660 const struct pci_device_id *pci_entry) 4660 const struct pci_device_id *pci_entry)
4661{ 4661{
4662 struct net_device *ndev = NULL; 4662 struct net_device *ndev = NULL;
4663 struct ql_adapter *qdev = NULL; 4663 struct ql_adapter *qdev = NULL;