* [PATCH 01/15] net: typhoon: remove unnecessary pci_set_drvdata()
2013-10-18 0:16 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 1 Jingoo Han
@ 2013-10-18 0:17 ` Jingoo Han
2013-10-18 0:18 ` [PATCH 02/15] net: 8390: " Jingoo Han
` (14 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Jingoo Han @ 2013-10-18 0:17 UTC (permalink / raw)
To: 'David S. Miller'
Cc: netdev, 'Jingoo Han', 'David Dillow'
The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: David Dillow <dave@thedillows.org>
---
drivers/net/ethernet/3com/typhoon.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/ethernet/3com/typhoon.c b/drivers/net/ethernet/3com/typhoon.c
index 144942f6..465cc71 100644
--- a/drivers/net/ethernet/3com/typhoon.c
+++ b/drivers/net/ethernet/3com/typhoon.c
@@ -2525,7 +2525,6 @@ typhoon_remove_one(struct pci_dev *pdev)
pci_release_regions(pdev);
pci_clear_mwi(pdev);
pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
free_netdev(dev);
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 02/15] net: 8390: remove unnecessary pci_set_drvdata()
2013-10-18 0:16 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 1 Jingoo Han
2013-10-18 0:17 ` [PATCH 01/15] net: typhoon: remove unnecessary pci_set_drvdata() Jingoo Han
@ 2013-10-18 0:18 ` Jingoo Han
2013-10-18 0:18 ` [PATCH 03/15] net: starfire: " Jingoo Han
` (13 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Jingoo Han @ 2013-10-18 0:18 UTC (permalink / raw)
To: 'David S. Miller'
Cc: netdev, 'Jingoo Han', 'Paul Gortmaker'
The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/net/ethernet/8390/ne2k-pci.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/net/ethernet/8390/ne2k-pci.c b/drivers/net/ethernet/8390/ne2k-pci.c
index 9220108..fc14a85 100644
--- a/drivers/net/ethernet/8390/ne2k-pci.c
+++ b/drivers/net/ethernet/8390/ne2k-pci.c
@@ -389,9 +389,7 @@ err_out_free_netdev:
free_netdev (dev);
err_out_free_res:
release_region (ioaddr, NE_IO_EXTENT);
- pci_set_drvdata (pdev, NULL);
return -ENODEV;
-
}
/*
@@ -655,7 +653,6 @@ static void ne2k_pci_remove_one(struct pci_dev *pdev)
release_region(dev->base_addr, NE_IO_EXTENT);
free_netdev(dev);
pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
}
#ifdef CONFIG_PM
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 03/15] net: starfire: remove unnecessary pci_set_drvdata()
2013-10-18 0:16 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 1 Jingoo Han
2013-10-18 0:17 ` [PATCH 01/15] net: typhoon: remove unnecessary pci_set_drvdata() Jingoo Han
2013-10-18 0:18 ` [PATCH 02/15] net: 8390: " Jingoo Han
@ 2013-10-18 0:18 ` Jingoo Han
2013-10-18 0:19 ` [PATCH 04/15] net: pcnet32: " Jingoo Han
` (12 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Jingoo Han @ 2013-10-18 0:18 UTC (permalink / raw)
To: 'David S. Miller'
Cc: netdev, 'Jingoo Han', 'Ion Badulescu'
The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/net/ethernet/adaptec/starfire.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c
index 8b04bfc..171d73c 100644
--- a/drivers/net/ethernet/adaptec/starfire.c
+++ b/drivers/net/ethernet/adaptec/starfire.c
@@ -835,7 +835,6 @@ static int starfire_init_one(struct pci_dev *pdev,
return 0;
err_out_cleardev:
- pci_set_drvdata(pdev, NULL);
iounmap(base);
err_out_free_res:
pci_release_regions (pdev);
@@ -2012,7 +2011,6 @@ static void starfire_remove_one(struct pci_dev *pdev)
iounmap(np->base);
pci_release_regions(pdev);
- pci_set_drvdata(pdev, NULL);
free_netdev(dev); /* Will also free np!! */
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 04/15] net: pcnet32: remove unnecessary pci_set_drvdata()
2013-10-18 0:16 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 1 Jingoo Han
` (2 preceding siblings ...)
2013-10-18 0:18 ` [PATCH 03/15] net: starfire: " Jingoo Han
@ 2013-10-18 0:19 ` Jingoo Han
2013-10-18 0:19 ` [PATCH 05/15] net: amd8111e: " Jingoo Han
` (11 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Jingoo Han @ 2013-10-18 0:19 UTC (permalink / raw)
To: 'David S. Miller'; +Cc: netdev, 'Jingoo Han', 'Don Fry'
The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Don Fry <pcnet32@frontier.com>
---
drivers/net/ethernet/amd/pcnet32.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c
index bd4e640..38492e0 100644
--- a/drivers/net/ethernet/amd/pcnet32.c
+++ b/drivers/net/ethernet/amd/pcnet32.c
@@ -2818,7 +2818,6 @@ static void pcnet32_remove_one(struct pci_dev *pdev)
lp->init_block, lp->init_dma_addr);
free_netdev(dev);
pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
}
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 05/15] net: amd8111e: remove unnecessary pci_set_drvdata()
2013-10-18 0:16 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 1 Jingoo Han
` (3 preceding siblings ...)
2013-10-18 0:19 ` [PATCH 04/15] net: pcnet32: " Jingoo Han
@ 2013-10-18 0:19 ` Jingoo Han
2013-10-18 0:20 ` [PATCH 06/15] net: alx: " Jingoo Han
` (10 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Jingoo Han @ 2013-10-18 0:19 UTC (permalink / raw)
To: 'David S. Miller'; +Cc: netdev, 'Jingoo Han'
The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/net/ethernet/amd/amd8111e.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c
index 1b1429d..d042511 100644
--- a/drivers/net/ethernet/amd/amd8111e.c
+++ b/drivers/net/ethernet/amd/amd8111e.c
@@ -1711,7 +1711,6 @@ static void amd8111e_remove_one(struct pci_dev *pdev)
free_netdev(dev);
pci_release_regions(pdev);
pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
}
}
static void amd8111e_config_ipg(struct net_device* dev)
@@ -1967,7 +1966,6 @@ err_free_reg:
err_disable_pdev:
pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
return err;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 06/15] net: alx: remove unnecessary pci_set_drvdata()
2013-10-18 0:16 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 1 Jingoo Han
` (4 preceding siblings ...)
2013-10-18 0:19 ` [PATCH 05/15] net: amd8111e: " Jingoo Han
@ 2013-10-18 0:20 ` Jingoo Han
2013-10-18 0:21 ` [PATCH 07/15] net: bnx2: " Jingoo Han
` (9 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Jingoo Han @ 2013-10-18 0:20 UTC (permalink / raw)
To: 'David S. Miller'
Cc: netdev, 'Jingoo Han', 'Jay Cliburn',
'Chris Snook'
The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/net/ethernet/atheros/alx/main.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c
index fc95b23..5aa5e81 100644
--- a/drivers/net/ethernet/atheros/alx/main.c
+++ b/drivers/net/ethernet/atheros/alx/main.c
@@ -1367,7 +1367,6 @@ static void alx_remove(struct pci_dev *pdev)
pci_disable_pcie_error_reporting(pdev);
pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
free_netdev(alx->dev);
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 07/15] net: bnx2: remove unnecessary pci_set_drvdata()
2013-10-18 0:16 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 1 Jingoo Han
` (5 preceding siblings ...)
2013-10-18 0:20 ` [PATCH 06/15] net: alx: " Jingoo Han
@ 2013-10-18 0:21 ` Jingoo Han
2013-10-18 0:21 ` [PATCH 08/15] net: bnx2x: " Jingoo Han
` (8 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Jingoo Han @ 2013-10-18 0:21 UTC (permalink / raw)
To: 'David S. Miller'
Cc: netdev, 'Jingoo Han', 'Michael Chan'
The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/net/ethernet/broadcom/bnx2.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 6111870..d9980ad 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -8413,7 +8413,6 @@ err_out_release:
err_out_disable:
pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
err_out:
return rc;
@@ -8546,7 +8545,6 @@ error:
pci_iounmap(pdev, bp->regview);
pci_release_regions(pdev);
pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
err_free:
free_netdev(dev);
return rc;
@@ -8578,7 +8576,6 @@ bnx2_remove_one(struct pci_dev *pdev)
pci_release_regions(pdev);
pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
}
static int
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 08/15] net: bnx2x: remove unnecessary pci_set_drvdata()
2013-10-18 0:16 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 1 Jingoo Han
` (6 preceding siblings ...)
2013-10-18 0:21 ` [PATCH 07/15] net: bnx2: " Jingoo Han
@ 2013-10-18 0:21 ` Jingoo Han
2013-10-18 0:21 ` [PATCH 09/15] net: tg3: " Jingoo Han
` (7 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Jingoo Han @ 2013-10-18 0:21 UTC (permalink / raw)
To: 'David S. Miller'
Cc: netdev, 'Jingoo Han', 'Eilon Greenstein'
The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index e53ff1e..8fd3432 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -12297,7 +12297,6 @@ err_out_release:
err_out_disable:
pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
err_out:
return rc;
@@ -12840,7 +12839,6 @@ init_one_exit:
pci_release_regions(pdev);
pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
return rc;
}
@@ -12923,7 +12921,6 @@ static void __bnx2x_remove(struct pci_dev *pdev,
pci_release_regions(pdev);
pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
}
static void bnx2x_remove_one(struct pci_dev *pdev)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 09/15] net: tg3: remove unnecessary pci_set_drvdata()
2013-10-18 0:16 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 1 Jingoo Han
` (7 preceding siblings ...)
2013-10-18 0:21 ` [PATCH 08/15] net: bnx2x: " Jingoo Han
@ 2013-10-18 0:21 ` Jingoo Han
2013-10-18 0:22 ` [PATCH 10/15] net: bna: " Jingoo Han
` (6 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Jingoo Han @ 2013-10-18 0:21 UTC (permalink / raw)
To: 'David S. Miller'
Cc: netdev, 'Jingoo Han', 'Nithin Nayak Sujir',
'Michael Chan'
The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/net/ethernet/broadcom/tg3.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 498569e..819d87c 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -17701,7 +17701,6 @@ err_out_free_res:
err_out_disable_pdev:
if (pci_is_enabled(pdev))
pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
return err;
}
@@ -17733,7 +17732,6 @@ static void tg3_remove_one(struct pci_dev *pdev)
free_netdev(dev);
pci_release_regions(pdev);
pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
}
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 10/15] net: bna: remove unnecessary pci_set_drvdata()
2013-10-18 0:16 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 1 Jingoo Han
` (8 preceding siblings ...)
2013-10-18 0:21 ` [PATCH 09/15] net: tg3: " Jingoo Han
@ 2013-10-18 0:22 ` Jingoo Han
2013-10-18 0:23 ` [PATCH 11/15] net: cxgb4: " Jingoo Han
` (5 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Jingoo Han @ 2013-10-18 0:22 UTC (permalink / raw)
To: 'David S. Miller'
Cc: netdev, 'Jingoo Han', 'Rasesh Mody'
The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/net/ethernet/brocade/bna/bnad.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
index b78e69e..f276433 100644
--- a/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/drivers/net/ethernet/brocade/bna/bnad.c
@@ -3212,7 +3212,6 @@ bnad_init(struct bnad *bnad,
bnad->bar0 = ioremap_nocache(bnad->mmio_start, bnad->mmio_len);
if (!bnad->bar0) {
dev_err(&pdev->dev, "ioremap for bar0 failed\n");
- pci_set_drvdata(pdev, NULL);
return -ENOMEM;
}
pr_info("bar0 mapped to %p, len %llu\n", bnad->bar0,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 11/15] net: cxgb4: remove unnecessary pci_set_drvdata()
2013-10-18 0:16 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 1 Jingoo Han
` (9 preceding siblings ...)
2013-10-18 0:22 ` [PATCH 10/15] net: bna: " Jingoo Han
@ 2013-10-18 0:23 ` Jingoo Han
2013-10-18 0:23 ` [PATCH 12/15] net: cxgb3: " Jingoo Han
` (4 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Jingoo Han @ 2013-10-18 0:23 UTC (permalink / raw)
To: 'David S. Miller'
Cc: netdev, 'Jingoo Han', 'Dimitris Michailidis'
The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 85d0cda..8b929ee 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -6075,7 +6075,6 @@ sriov:
pci_disable_device(pdev);
out_release_regions:
pci_release_regions(pdev);
- pci_set_drvdata(pdev, NULL);
return err;
}
@@ -6123,7 +6122,6 @@ static void remove_one(struct pci_dev *pdev)
pci_disable_pcie_error_reporting(pdev);
pci_disable_device(pdev);
pci_release_regions(pdev);
- pci_set_drvdata(pdev, NULL);
} else
pci_release_regions(pdev);
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 12/15] net: cxgb3: remove unnecessary pci_set_drvdata()
2013-10-18 0:16 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 1 Jingoo Han
` (10 preceding siblings ...)
2013-10-18 0:23 ` [PATCH 11/15] net: cxgb4: " Jingoo Han
@ 2013-10-18 0:23 ` Jingoo Han
2013-10-18 0:24 ` [PATCH 13/15] net: cxgb2: " Jingoo Han
` (3 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Jingoo Han @ 2013-10-18 0:23 UTC (permalink / raw)
To: 'David S. Miller'
Cc: netdev, 'Jingoo Han', 'Divy Le Ray'
The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
index b650951..45d7733 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
@@ -3374,7 +3374,6 @@ out_release_regions:
pci_release_regions(pdev);
out_disable_device:
pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
out:
return err;
}
@@ -3415,7 +3414,6 @@ static void remove_one(struct pci_dev *pdev)
kfree(adapter);
pci_release_regions(pdev);
pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
}
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 13/15] net: cxgb2: remove unnecessary pci_set_drvdata()
2013-10-18 0:16 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 1 Jingoo Han
` (11 preceding siblings ...)
2013-10-18 0:23 ` [PATCH 12/15] net: cxgb3: " Jingoo Han
@ 2013-10-18 0:24 ` Jingoo Han
2013-10-18 0:24 ` [PATCH 14/15] net: cxgb4vf: " Jingoo Han
` (2 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Jingoo Han @ 2013-10-18 0:24 UTC (permalink / raw)
To: 'David S. Miller'; +Cc: netdev, 'Jingoo Han'
The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/net/ethernet/chelsio/cxgb/cxgb2.c b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
index d7048db..1d02105 100644
--- a/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
+++ b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
@@ -1168,7 +1168,6 @@ out_free_dev:
pci_release_regions(pdev);
out_disable_pdev:
pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
return err;
}
@@ -1347,7 +1346,6 @@ static void remove_one(struct pci_dev *pdev)
pci_release_regions(pdev);
pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
t1_sw_reset(pdev);
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 14/15] net: cxgb4vf: remove unnecessary pci_set_drvdata()
2013-10-18 0:16 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 1 Jingoo Han
` (12 preceding siblings ...)
2013-10-18 0:24 ` [PATCH 13/15] net: cxgb2: " Jingoo Han
@ 2013-10-18 0:24 ` Jingoo Han
2013-10-18 0:25 ` [PATCH 15/15] net: enic: " Jingoo Han
2013-10-18 4:04 ` [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 1 David Miller
15 siblings, 0 replies; 19+ messages in thread
From: Jingoo Han @ 2013-10-18 0:24 UTC (permalink / raw)
To: 'David S. Miller'
Cc: netdev, 'Jingoo Han', 'Casey Leedom'
The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
index 40c22e7..43bb012 100644
--- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
@@ -2782,11 +2782,9 @@ err_unmap_bar:
err_free_adapter:
kfree(adapter);
- pci_set_drvdata(pdev, NULL);
err_release_regions:
pci_release_regions(pdev);
- pci_set_drvdata(pdev, NULL);
pci_clear_master(pdev);
err_disable_device:
@@ -2851,7 +2849,6 @@ static void cxgb4vf_pci_remove(struct pci_dev *pdev)
}
iounmap(adapter->regs);
kfree(adapter);
- pci_set_drvdata(pdev, NULL);
}
/*
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 15/15] net: enic: remove unnecessary pci_set_drvdata()
2013-10-18 0:16 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 1 Jingoo Han
` (13 preceding siblings ...)
2013-10-18 0:24 ` [PATCH 14/15] net: cxgb4vf: " Jingoo Han
@ 2013-10-18 0:25 ` Jingoo Han
2013-10-18 16:00 ` Neel Patel (neepatel)
2013-10-21 14:02 ` Sujith Sankar (ssujith)
2013-10-18 4:04 ` [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 1 David Miller
15 siblings, 2 replies; 19+ messages in thread
From: Jingoo Han @ 2013-10-18 0:25 UTC (permalink / raw)
To: 'David S. Miller'
Cc: netdev, 'Jingoo Han', 'Christian Benvenuti',
'Sujith Sankar', 'Govindarajulu Varadarajan',
'Neel Patel', 'Nishank Trivedi'
The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/net/ethernet/cisco/enic/enic_main.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index 7b756cf9..ff78dfa 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -2309,7 +2309,6 @@ err_out_release_regions:
err_out_disable_device:
pci_disable_device(pdev);
err_out_free_netdev:
- pci_set_drvdata(pdev, NULL);
free_netdev(netdev);
return err;
@@ -2338,7 +2337,6 @@ static void enic_remove(struct pci_dev *pdev)
enic_iounmap(enic);
pci_release_regions(pdev);
pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
free_netdev(netdev);
}
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* RE: [PATCH 15/15] net: enic: remove unnecessary pci_set_drvdata()
2013-10-18 0:25 ` [PATCH 15/15] net: enic: " Jingoo Han
@ 2013-10-18 16:00 ` Neel Patel (neepatel)
2013-10-21 14:02 ` Sujith Sankar (ssujith)
1 sibling, 0 replies; 19+ messages in thread
From: Neel Patel (neepatel) @ 2013-10-18 16:00 UTC (permalink / raw)
To: Jingoo Han, 'David S. Miller'
Cc: netdev@vger.kernel.org, Christian Benvenuti (benve),
Sujith Sankar (ssujith), 'Govindarajulu Varadarajan',
Nishank Trivedi (nistrive)
Looks good.
-----Original Message-----
From: Jingoo Han [mailto:jg1.han@samsung.com]
Sent: Thursday, October 17, 2013 5:25 PM
To: 'David S. Miller'
Cc: netdev@vger.kernel.org; 'Jingoo Han'; Christian Benvenuti (benve); Sujith Sankar (ssujith); 'Govindarajulu Varadarajan'; Neel Patel (neepatel); Nishank Trivedi (nistrive)
Subject: [PATCH 15/15] net: enic: remove unnecessary pci_set_drvdata()
The driver core clears the driver data to NULL after device_release or on probe failure. Thus, it is not needed to manually clear the device driver data to NULL.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/net/ethernet/cisco/enic/enic_main.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index 7b756cf9..ff78dfa 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -2309,7 +2309,6 @@ err_out_release_regions:
err_out_disable_device:
pci_disable_device(pdev);
err_out_free_netdev:
- pci_set_drvdata(pdev, NULL);
free_netdev(netdev);
return err;
@@ -2338,7 +2337,6 @@ static void enic_remove(struct pci_dev *pdev)
enic_iounmap(enic);
pci_release_regions(pdev);
pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
free_netdev(netdev);
}
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH 15/15] net: enic: remove unnecessary pci_set_drvdata()
2013-10-18 0:25 ` [PATCH 15/15] net: enic: " Jingoo Han
2013-10-18 16:00 ` Neel Patel (neepatel)
@ 2013-10-21 14:02 ` Sujith Sankar (ssujith)
1 sibling, 0 replies; 19+ messages in thread
From: Sujith Sankar (ssujith) @ 2013-10-21 14:02 UTC (permalink / raw)
To: Jingoo Han, 'David S. Miller'
Cc: netdev@vger.kernel.org, Christian Benvenuti (benve),
'Govindarajulu Varadarajan', Neel Patel (neepatel)
This looks good to me.
Regards,
-Sujith
On 18/10/13 5:55 AM, "Jingoo Han" <jg1.han@samsung.com> wrote:
>The driver core clears the driver data to NULL after device_release
>or on probe failure. Thus, it is not needed to manually clear the
>device driver data to NULL.
>
>Signed-off-by: Jingoo Han <jg1.han@samsung.com>
>---
> drivers/net/ethernet/cisco/enic/enic_main.c | 2 --
> 1 file changed, 2 deletions(-)
>
>diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c
>b/drivers/net/ethernet/cisco/enic/enic_main.c
>index 7b756cf9..ff78dfa 100644
>--- a/drivers/net/ethernet/cisco/enic/enic_main.c
>+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
>@@ -2309,7 +2309,6 @@ err_out_release_regions:
> err_out_disable_device:
> pci_disable_device(pdev);
> err_out_free_netdev:
>- pci_set_drvdata(pdev, NULL);
> free_netdev(netdev);
>
> return err;
>@@ -2338,7 +2337,6 @@ static void enic_remove(struct pci_dev *pdev)
> enic_iounmap(enic);
> pci_release_regions(pdev);
> pci_disable_device(pdev);
>- pci_set_drvdata(pdev, NULL);
> free_netdev(netdev);
> }
> }
>--
>1.7.10.4
>
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 1
2013-10-18 0:16 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 1 Jingoo Han
` (14 preceding siblings ...)
2013-10-18 0:25 ` [PATCH 15/15] net: enic: " Jingoo Han
@ 2013-10-18 4:04 ` David Miller
15 siblings, 0 replies; 19+ messages in thread
From: David Miller @ 2013-10-18 4:04 UTC (permalink / raw)
To: jg1.han; +Cc: netdev
From: Jingoo Han <jg1.han@samsung.com>
Date: Fri, 18 Oct 2013 09:16:19 +0900
> Since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d
> (device-core: Ensure drvdata = NULL when no driver is bound),
> the driver core clears the driver data to NULL after device_release
> or on probe failure. Thus, it is not needed to manually clear the
> device driver data to NULL.
Series applied, thanks.
^ permalink raw reply [flat|nested] 19+ messages in thread