aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/atheros
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/atheros
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/atheros')
-rw-r--r--drivers/net/ethernet/atheros/atl1c/atl1c_main.c3
-rw-r--r--drivers/net/ethernet/atheros/atl1e/atl1e_main.c3
-rw-r--r--drivers/net/ethernet/atheros/atlx/atl1.c5
-rw-r--r--drivers/net/ethernet/atheros/atlx/atl2.c3
4 files changed, 5 insertions, 9 deletions
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index 44bee4a2b9b3..56d3f697e0c7 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -2442,8 +2442,7 @@ static int atl1c_init_netdev(struct net_device *netdev, struct pci_dev *pdev)
2442 * The OS initialization, configuring of the adapter private structure, 2442 * The OS initialization, configuring of the adapter private structure,
2443 * and a hardware reset occur. 2443 * and a hardware reset occur.
2444 */ 2444 */
2445static int atl1c_probe(struct pci_dev *pdev, 2445static int atl1c_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
2446 const struct pci_device_id *ent)
2447{ 2446{
2448 struct net_device *netdev; 2447 struct net_device *netdev;
2449 struct atl1c_adapter *adapter; 2448 struct atl1c_adapter *adapter;
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
index dec5d2cfd386..e4466a36d106 100644
--- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
@@ -2235,8 +2235,7 @@ static int atl1e_init_netdev(struct net_device *netdev, struct pci_dev *pdev)
2235 * The OS initialization, configuring of the adapter private structure, 2235 * The OS initialization, configuring of the adapter private structure,
2236 * and a hardware reset occur. 2236 * and a hardware reset occur.
2237 */ 2237 */
2238static int atl1e_probe(struct pci_dev *pdev, 2238static int atl1e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
2239 const struct pci_device_id *ent)
2240{ 2239{
2241 struct net_device *netdev; 2240 struct net_device *netdev;
2242 struct atl1e_adapter *adapter = NULL; 2241 struct atl1e_adapter *adapter = NULL;
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c
index 3e7327ec3901..71b3d7daa21d 100644
--- a/drivers/net/ethernet/atheros/atlx/atl1.c
+++ b/drivers/net/ethernet/atheros/atlx/atl1.c
@@ -144,7 +144,7 @@ struct atl1_option {
144}; 144};
145 145
146static int atl1_validate_option(int *value, struct atl1_option *opt, 146static int atl1_validate_option(int *value, struct atl1_option *opt,
147 struct pci_dev *pdev) 147 struct pci_dev *pdev)
148{ 148{
149 if (*value == OPTION_UNSET) { 149 if (*value == OPTION_UNSET) {
150 *value = opt->def; 150 *value = opt->def;
@@ -2934,8 +2934,7 @@ static const struct net_device_ops atl1_netdev_ops = {
2934 * The OS initialization, configuring of the adapter private structure, 2934 * The OS initialization, configuring of the adapter private structure,
2935 * and a hardware reset occur. 2935 * and a hardware reset occur.
2936 */ 2936 */
2937static int atl1_probe(struct pci_dev *pdev, 2937static int atl1_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
2938 const struct pci_device_id *ent)
2939{ 2938{
2940 struct net_device *netdev; 2939 struct net_device *netdev;
2941 struct atl1_adapter *adapter; 2940 struct atl1_adapter *adapter;
diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
index 7dc9766bb5ba..aab83a2d4e07 100644
--- a/drivers/net/ethernet/atheros/atlx/atl2.c
+++ b/drivers/net/ethernet/atheros/atlx/atl2.c
@@ -1338,8 +1338,7 @@ static const struct net_device_ops atl2_netdev_ops = {
1338 * The OS initialization, configuring of the adapter private structure, 1338 * The OS initialization, configuring of the adapter private structure,
1339 * and a hardware reset occur. 1339 * and a hardware reset occur.
1340 */ 1340 */
1341static int atl2_probe(struct pci_dev *pdev, 1341static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
1342 const struct pci_device_id *ent)
1343{ 1342{
1344 struct net_device *netdev; 1343 struct net_device *netdev;
1345 struct atl2_adapter *adapter; 1344 struct atl2_adapter *adapter;