diff options
Diffstat (limited to 'drivers/net/ethernet/atheros')
-rw-r--r-- | drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 3 | ||||
-rw-r--r-- | drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 3 | ||||
-rw-r--r-- | drivers/net/ethernet/atheros/atlx/atl1.c | 5 | ||||
-rw-r--r-- | drivers/net/ethernet/atheros/atlx/atl2.c | 3 |
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 44bee4a2b9b..56d3f697e0c 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 | */ |
2445 | static int atl1c_probe(struct pci_dev *pdev, | 2445 | static 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 dec5d2cfd38..e4466a36d10 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 | */ |
2238 | static int atl1e_probe(struct pci_dev *pdev, | 2238 | static 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 3e7327ec390..71b3d7daa21 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 | ||
146 | static int atl1_validate_option(int *value, struct atl1_option *opt, | 146 | static 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 | */ |
2937 | static int atl1_probe(struct pci_dev *pdev, | 2937 | static 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 7dc9766bb5b..aab83a2d4e0 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 | */ |
1341 | static int atl2_probe(struct pci_dev *pdev, | 1341 | static 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; |