[PATCH net-next 00/18] net: dsa: remove unnecessary set_drvdata()

[PATCH net-next 00/18] net: dsa: remove unnecessary set_drvdata()

[Yang Yingliang]

In this patch set, I removed all set_drvdata(NULL) functions in ->remove() in
drivers/net/dsa/.

The driver_data will be set to NULL in device_unbind_cleanup() after calling ->remove(),
so all set_drvdata(NULL) functions in ->remove() is redundant, they can be removed.

Here is the previous patch set:
https://lore.kernel.org/netdev/facfc855-d082-cc1c-a0bc-027f562a2f45@huawei.com/T/

Yang Yingliang (18):
  net: dsa: b53: remove unnecessary set_drvdata()
  net: dsa: bcm_sf2: remove unnecessary platform_set_drvdata()
  net: dsa: loop: remove unnecessary dev_set_drvdata()
  net: dsa: hellcreek: remove unnecessary platform_set_drvdata()
  net: dsa: lan9303: remove unnecessary dev_set_drvdata()
  net: dsa: lantiq_gswip: remove unnecessary platform_set_drvdata()
  net: dsa: microchip: remove unnecessary set_drvdata()
  net: dsa: mt7530: remove unnecessary dev_set_drvdata()
  net: dsa: mv88e6060: remove unnecessary dev_set_drvdata()
  net: dsa: mv88e6xxx: remove unnecessary dev_set_drvdata()
  net: dsa: ocelot: remove unnecessary set_drvdata()
  net: dsa: ar9331: remove unnecessary dev_set_drvdata()
  net: dsa: qca8k: remove unnecessary dev_set_drvdata()
  net: dsa: realtek: remove unnecessary set_drvdata()
  net: dsa: rzn1-a5psw: remove unnecessary platform_set_drvdata()
  net: dsa: sja1105: remove unnecessary spi_set_drvdata()
  net: dsa: vitesse-vsc73xx: remove unnecessary set_drvdata()
  net: dsa: xrs700x: remove unnecessary dev_set_drvdata()

 drivers/net/dsa/b53/b53_mdio.c             | 2 --
 drivers/net/dsa/b53/b53_mmap.c             | 2 --
 drivers/net/dsa/b53/b53_srab.c             | 2 --
 drivers/net/dsa/bcm_sf2.c                  | 2 --
 drivers/net/dsa/dsa_loop.c                 | 2 --
 drivers/net/dsa/hirschmann/hellcreek.c     | 1 -
 drivers/net/dsa/lan9303_mdio.c             | 2 --
 drivers/net/dsa/lantiq_gswip.c             | 2 --
 drivers/net/dsa/microchip/ksz8863_smi.c    | 2 --
 drivers/net/dsa/microchip/ksz_spi.c        | 2 --
 drivers/net/dsa/mt7530.c                   | 2 --
 drivers/net/dsa/mv88e6060.c                | 2 --
 drivers/net/dsa/mv88e6xxx/chip.c           | 2 --
 drivers/net/dsa/ocelot/felix_vsc9959.c     | 2 --
 drivers/net/dsa/ocelot/seville_vsc9953.c   | 2 --
 drivers/net/dsa/qca/ar9331.c               | 2 --
 drivers/net/dsa/qca/qca8k-8xxx.c           | 2 --
 drivers/net/dsa/realtek/realtek-mdio.c     | 2 --
 drivers/net/dsa/realtek/realtek-smi.c      | 2 --
 drivers/net/dsa/rzn1_a5psw.c               | 2 --
 drivers/net/dsa/sja1105/sja1105_main.c     | 2 --
 drivers/net/dsa/vitesse-vsc73xx-platform.c | 2 --
 drivers/net/dsa/vitesse-vsc73xx-spi.c      | 2 --
 drivers/net/dsa/xrs700x/xrs700x_mdio.c     | 2 --
 24 files changed, 47 deletions(-)

-- 
2.25.1

[PATCH net-next 01/18] net: dsa: b53: remove unnecessary set_drvdata()

[Yang Yingliang]

Remove unnecessary set_drvdata(NULL) function in ->remove(),
the driver_data will be set to NULL in device_unbind_cleanup()
after calling ->remove().

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/dsa/b53/b53_mdio.c | 2 --
 drivers/net/dsa/b53/b53_mmap.c | 2 --
 drivers/net/dsa/b53/b53_srab.c | 2 --
 3 files changed, 6 deletions(-)

diff --git a/drivers/net/dsa/b53/b53_mdio.c b/drivers/net/dsa/b53/b53_mdio.c
index a7aeb3c132c9..6ddc03b58b28 100644
--- a/drivers/net/dsa/b53/b53_mdio.c
+++ b/drivers/net/dsa/b53/b53_mdio.c
@@ -356,8 +356,6 @@ static void b53_mdio_remove(struct mdio_device *mdiodev)
 		return;
 
 	b53_switch_remove(dev);
-
-	dev_set_drvdata(&mdiodev->dev, NULL);
 }
 
 static void b53_mdio_shutdown(struct mdio_device *mdiodev)
diff --git a/drivers/net/dsa/b53/b53_mmap.c b/drivers/net/dsa/b53/b53_mmap.c
index ae4c79d39bc0..e968322dfbf0 100644
--- a/drivers/net/dsa/b53/b53_mmap.c
+++ b/drivers/net/dsa/b53/b53_mmap.c
@@ -316,8 +316,6 @@ static int b53_mmap_remove(struct platform_device *pdev)
 	if (dev)
 		b53_switch_remove(dev);
 
-	platform_set_drvdata(pdev, NULL);
-
 	return 0;
 }
 
diff --git a/drivers/net/dsa/b53/b53_srab.c b/drivers/net/dsa/b53/b53_srab.c
index da0b889880f6..bcb44034404d 100644
--- a/drivers/net/dsa/b53/b53_srab.c
+++ b/drivers/net/dsa/b53/b53_srab.c
@@ -667,8 +667,6 @@ static int b53_srab_remove(struct platform_device *pdev)
 	b53_srab_intr_set(dev->priv, false);
 	b53_switch_remove(dev);
 
-	platform_set_drvdata(pdev, NULL);
-
 	return 0;
 }
 
-- 
2.25.1

[PATCH net-next 02/18] net: dsa: bcm_sf2: remove unnecessary platform_set_drvdata()

[Yang Yingliang]

Remove unnecessary platform_set_drvdata() in ->remove(), the driver_data
will be set to NULL in device_unbind_cleanup() after calling ->remove().

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/dsa/bcm_sf2.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
index 6507663f35e5..cde253d27bd0 100644
--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -1551,8 +1551,6 @@ static int bcm_sf2_sw_remove(struct platform_device *pdev)
 	if (priv->type == BCM7278_DEVICE_ID)
 		reset_control_assert(priv->rcdev);
 
-	platform_set_drvdata(pdev, NULL);
-
 	return 0;
 }
 
-- 
2.25.1

[PATCH net-next 03/18] net: dsa: loop: remove unnecessary dev_set_drvdata()

[Yang Yingliang]

Remove unnecessary dev_set_drvdata() in ->remove(), the driver_data will
be set to NULL in device_unbind_cleanup() after calling ->remove().

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/dsa/dsa_loop.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/dsa/dsa_loop.c b/drivers/net/dsa/dsa_loop.c
index 263e41191c29..b9107fe40023 100644
--- a/drivers/net/dsa/dsa_loop.c
+++ b/drivers/net/dsa/dsa_loop.c
@@ -351,8 +351,6 @@ static void dsa_loop_drv_remove(struct mdio_device *mdiodev)
 
 	dsa_unregister_switch(ds);
 	dev_put(ps->netdev);
-
-	dev_set_drvdata(&mdiodev->dev, NULL);
 }
 
 static void dsa_loop_drv_shutdown(struct mdio_device *mdiodev)
-- 
2.25.1

[PATCH net-next 04/18] net: dsa: hellcreek: remove unnecessary platform_set_drvdata()

[Yang Yingliang]

Remove unnecessary platform_set_drvdata() in ->remove(), the driver_data
will be set to NULL in device_unbind_cleanup() after calling ->remove().

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/dsa/hirschmann/hellcreek.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/dsa/hirschmann/hellcreek.c b/drivers/net/dsa/hirschmann/hellcreek.c
index ea8bbfce0f1f..eac6ace7c5f9 100644
--- a/drivers/net/dsa/hirschmann/hellcreek.c
+++ b/drivers/net/dsa/hirschmann/hellcreek.c
@@ -1996,7 +1996,6 @@ static int hellcreek_remove(struct platform_device *pdev)
 	hellcreek_hwtstamp_free(hellcreek);
 	hellcreek_ptp_free(hellcreek);
 	dsa_unregister_switch(hellcreek->ds);
-	platform_set_drvdata(pdev, NULL);
 
 	return 0;
 }
-- 
2.25.1

[PATCH net-next 05/18] net: dsa: lan9303: remove unnecessary dev_set_drvdata()

[Yang Yingliang]

Remove unnecessary dev_set_drvdata() in ->remove(), the driver_data will
be set to NULL in device_unbind_cleanup() after calling ->remove().

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/dsa/lan9303_mdio.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/dsa/lan9303_mdio.c b/drivers/net/dsa/lan9303_mdio.c
index d12c55fdc811..4f33369a2de5 100644
--- a/drivers/net/dsa/lan9303_mdio.c
+++ b/drivers/net/dsa/lan9303_mdio.c
@@ -138,8 +138,6 @@ static void lan9303_mdio_remove(struct mdio_device *mdiodev)
 		return;
 
 	lan9303_remove(&sw_dev->chip);
-
-	dev_set_drvdata(&mdiodev->dev, NULL);
 }
 
 static void lan9303_mdio_shutdown(struct mdio_device *mdiodev)
-- 
2.25.1

[PATCH net-next 06/18] net: dsa: lantiq_gswip: remove unnecessary platform_set_drvdata()

[Yang Yingliang]

Remove unnecessary platform_set_drvdata() in ->remove(), the driver_data
will be set to NULL in device_unbind_cleanup() after calling ->remove().

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/dsa/lantiq_gswip.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/dsa/lantiq_gswip.c b/drivers/net/dsa/lantiq_gswip.c
index e531b93f3cb2..f78ee6dd28b8 100644
--- a/drivers/net/dsa/lantiq_gswip.c
+++ b/drivers/net/dsa/lantiq_gswip.c
@@ -2231,8 +2231,6 @@ static int gswip_remove(struct platform_device *pdev)
 	for (i = 0; i < priv->num_gphy_fw; i++)
 		gswip_gphy_fw_remove(priv, &priv->gphy_fw[i]);
 
-	platform_set_drvdata(pdev, NULL);
-
 	return 0;
 }
 
-- 
2.25.1

[PATCH net-next 07/18] net: dsa: microchip: remove unnecessary set_drvdata()

[Yang Yingliang]

Remove unnecessary set_drvdata(NULL) function in ->remove(),
the driver_data will be set to NULL in device_unbind_cleanup()
after calling ->remove().

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/dsa/microchip/ksz8863_smi.c | 2 --
 drivers/net/dsa/microchip/ksz_spi.c     | 2 --
 2 files changed, 4 deletions(-)

diff --git a/drivers/net/dsa/microchip/ksz8863_smi.c b/drivers/net/dsa/microchip/ksz8863_smi.c
index 5247fdfb964d..ddb40838181e 100644
--- a/drivers/net/dsa/microchip/ksz8863_smi.c
+++ b/drivers/net/dsa/microchip/ksz8863_smi.c
@@ -180,8 +180,6 @@ static void ksz8863_smi_remove(struct mdio_device *mdiodev)
 
 	if (dev)
 		ksz_switch_remove(dev);
-
-	dev_set_drvdata(&mdiodev->dev, NULL);
 }
 
 static void ksz8863_smi_shutdown(struct mdio_device *mdiodev)
diff --git a/drivers/net/dsa/microchip/ksz_spi.c b/drivers/net/dsa/microchip/ksz_spi.c
index 82e2352f55fa..1b6ab891b986 100644
--- a/drivers/net/dsa/microchip/ksz_spi.c
+++ b/drivers/net/dsa/microchip/ksz_spi.c
@@ -107,8 +107,6 @@ static void ksz_spi_remove(struct spi_device *spi)
 
 	if (dev)
 		ksz_switch_remove(dev);
-
-	spi_set_drvdata(spi, NULL);
 }
 
 static void ksz_spi_shutdown(struct spi_device *spi)
-- 
2.25.1

[PATCH net-next 08/18] net: dsa: mt7530: remove unnecessary dev_set_drvdata()

[Yang Yingliang]

Remove unnecessary dev_set_drvdata() in ->remove(), the driver_data will
be set to NULL in device_unbind_cleanup() after calling ->remove().

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/dsa/mt7530.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
index 835807911be0..a6cb5b0406fe 100644
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -3300,8 +3300,6 @@ mt7530_remove(struct mdio_device *mdiodev)
 
 	dsa_unregister_switch(priv->ds);
 	mutex_destroy(&priv->reg_mutex);
-
-	dev_set_drvdata(&mdiodev->dev, NULL);
 }
 
 static void mt7530_shutdown(struct mdio_device *mdiodev)
-- 
2.25.1

[PATCH net-next 09/18] net: dsa: mv88e6060: remove unnecessary dev_set_drvdata()

[Yang Yingliang]

Remove unnecessary dev_set_drvdata() in ->remove(), the driver_data will
be set to NULL in device_unbind_cleanup() after calling ->remove().

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/dsa/mv88e6060.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/dsa/mv88e6060.c b/drivers/net/dsa/mv88e6060.c
index 83dca9179aa0..fdda62d6eb16 100644
--- a/drivers/net/dsa/mv88e6060.c
+++ b/drivers/net/dsa/mv88e6060.c
@@ -297,8 +297,6 @@ static void mv88e6060_remove(struct mdio_device *mdiodev)
 		return;
 
 	dsa_unregister_switch(ds);
-
-	dev_set_drvdata(&mdiodev->dev, NULL);
 }
 
 static void mv88e6060_shutdown(struct mdio_device *mdiodev)
-- 
2.25.1

[PATCH net-next 10/18] net: dsa: mv88e6xxx: remove unnecessary dev_set_drvdata()

[Yang Yingliang]

Remove unnecessary dev_set_drvdata() in ->remove(), the driver_data will
be set to NULL in device_unbind_cleanup() after calling ->remove().

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/dsa/mv88e6xxx/chip.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 5f178faa110f..2479be3a1e35 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -7185,8 +7185,6 @@ static void mv88e6xxx_remove(struct mdio_device *mdiodev)
 		mv88e6xxx_g1_irq_free(chip);
 	else
 		mv88e6xxx_irq_poll_free(chip);
-
-	dev_set_drvdata(&mdiodev->dev, NULL);
 }
 
 static void mv88e6xxx_shutdown(struct mdio_device *mdiodev)
-- 
2.25.1

[PATCH net-next 11/18] net: dsa: ocelot: remove unnecessary set_drvdata()

[Yang Yingliang]

Remove unnecessary set_drvdata(NULL) function in ->remove(),
the driver_data will be set to NULL in device_unbind_cleanup()
after calling ->remove().

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/dsa/ocelot/felix_vsc9959.c   | 2 --
 drivers/net/dsa/ocelot/seville_vsc9953.c | 2 --
 2 files changed, 4 deletions(-)

diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
index 459288d6222c..2ec49e42b3f4 100644
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -2727,8 +2727,6 @@ static void felix_pci_remove(struct pci_dev *pdev)
 	kfree(felix);
 
 	pci_disable_device(pdev);
-
-	pci_set_drvdata(pdev, NULL);
 }
 
 static void felix_pci_shutdown(struct pci_dev *pdev)
diff --git a/drivers/net/dsa/ocelot/seville_vsc9953.c b/drivers/net/dsa/ocelot/seville_vsc9953.c
index 3ce1cd1a8d4a..5b29fa930627 100644
--- a/drivers/net/dsa/ocelot/seville_vsc9953.c
+++ b/drivers/net/dsa/ocelot/seville_vsc9953.c
@@ -1153,8 +1153,6 @@ static int seville_remove(struct platform_device *pdev)
 	kfree(felix->ds);
 	kfree(felix);
 
-	platform_set_drvdata(pdev, NULL);
-
 	return 0;
 }
 
-- 
2.25.1

[PATCH net-next 12/18] net: dsa: ar9331: remove unnecessary dev_set_drvdata()

[Yang Yingliang]

Remove unnecessary dev_set_drvdata() in ->remove(), the driver_data will
be set to NULL in device_unbind_cleanup() after calling ->remove().

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/dsa/qca/ar9331.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/dsa/qca/ar9331.c b/drivers/net/dsa/qca/ar9331.c
index 0796b7cf8cae..e7b98b864fa1 100644
--- a/drivers/net/dsa/qca/ar9331.c
+++ b/drivers/net/dsa/qca/ar9331.c
@@ -1099,8 +1099,6 @@ static void ar9331_sw_remove(struct mdio_device *mdiodev)
 	dsa_unregister_switch(&priv->ds);
 
 	reset_control_assert(priv->sw_reset);
-
-	dev_set_drvdata(&mdiodev->dev, NULL);
 }
 
 static void ar9331_sw_shutdown(struct mdio_device *mdiodev)
-- 
2.25.1

[PATCH net-next 13/18] net: dsa: qca8k: remove unnecessary dev_set_drvdata()

[Yang Yingliang]

Remove unnecessary dev_set_drvdata() in ->remove(), the driver_data will
be set to NULL in device_unbind_cleanup() after calling ->remove().

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/dsa/qca/qca8k-8xxx.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/dsa/qca/qca8k-8xxx.c b/drivers/net/dsa/qca/qca8k-8xxx.c
index c181346388a4..5669c92c93f7 100644
--- a/drivers/net/dsa/qca/qca8k-8xxx.c
+++ b/drivers/net/dsa/qca/qca8k-8xxx.c
@@ -1957,8 +1957,6 @@ qca8k_sw_remove(struct mdio_device *mdiodev)
 		qca8k_port_set_status(priv, i, 0);
 
 	dsa_unregister_switch(priv->ds);
-
-	dev_set_drvdata(&mdiodev->dev, NULL);
 }
 
 static void qca8k_sw_shutdown(struct mdio_device *mdiodev)
-- 
2.25.1

[PATCH net-next 14/18] net: dsa: realtek: remove unnecessary set_drvdata()

[Yang Yingliang]

Remove unnecessary set_drvdata(NULL) function in ->remove(),
the driver_data will be set to NULL in device_unbind_cleanup()
after calling ->remove().

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/dsa/realtek/realtek-mdio.c | 2 --
 drivers/net/dsa/realtek/realtek-smi.c  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/drivers/net/dsa/realtek/realtek-mdio.c b/drivers/net/dsa/realtek/realtek-mdio.c
index c58f49d558d2..3e54fac5f902 100644
--- a/drivers/net/dsa/realtek/realtek-mdio.c
+++ b/drivers/net/dsa/realtek/realtek-mdio.c
@@ -245,8 +245,6 @@ static void realtek_mdio_remove(struct mdio_device *mdiodev)
 	/* leave the device reset asserted */
 	if (priv->reset)
 		gpiod_set_value(priv->reset, 1);
-
-	dev_set_drvdata(&mdiodev->dev, NULL);
 }
 
 static void realtek_mdio_shutdown(struct mdio_device *mdiodev)
diff --git a/drivers/net/dsa/realtek/realtek-smi.c b/drivers/net/dsa/realtek/realtek-smi.c
index 45992f79ec8d..1b447d96b9c4 100644
--- a/drivers/net/dsa/realtek/realtek-smi.c
+++ b/drivers/net/dsa/realtek/realtek-smi.c
@@ -522,8 +522,6 @@ static int realtek_smi_remove(struct platform_device *pdev)
 	if (priv->reset)
 		gpiod_set_value(priv->reset, 1);
 
-	platform_set_drvdata(pdev, NULL);
-
 	return 0;
 }
 
-- 
2.25.1

[PATCH net-next 15/18] net: dsa: rzn1-a5psw: remove unnecessary platform_set_drvdata()

[Yang Yingliang]

Remove unnecessary platform_set_drvdata() in ->remove(), the driver_data
will be set to NULL in device_unbind_cleanup() after calling ->remove().

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/dsa/rzn1_a5psw.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/dsa/rzn1_a5psw.c b/drivers/net/dsa/rzn1_a5psw.c
index 0744e8162e1d..ed413d555bec 100644
--- a/drivers/net/dsa/rzn1_a5psw.c
+++ b/drivers/net/dsa/rzn1_a5psw.c
@@ -1025,8 +1025,6 @@ static int a5psw_remove(struct platform_device *pdev)
 	clk_disable_unprepare(a5psw->hclk);
 	clk_disable_unprepare(a5psw->clk);
 
-	platform_set_drvdata(pdev, NULL);
-
 	return 0;
 }
 
-- 
2.25.1

[PATCH net-next 16/18] net: dsa: sja1105: remove unnecessary spi_set_drvdata()

[Yang Yingliang]

Remove unnecessary spi_set_drvdata() in ->remove(), the driver_data will
be set to NULL in device_unbind_cleanup() after calling ->remove().

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/dsa/sja1105/sja1105_main.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c
index b03d0d0c3dbf..412666111b0c 100644
--- a/drivers/net/dsa/sja1105/sja1105_main.c
+++ b/drivers/net/dsa/sja1105/sja1105_main.c
@@ -3351,8 +3351,6 @@ static void sja1105_remove(struct spi_device *spi)
 		return;
 
 	dsa_unregister_switch(priv->ds);
-
-	spi_set_drvdata(spi, NULL);
 }
 
 static void sja1105_shutdown(struct spi_device *spi)
-- 
2.25.1

[PATCH net-next 17/18] net: dsa: vitesse-vsc73xx: remove unnecessary set_drvdata()

[Yang Yingliang]

Remove unnecessary set_drvdata(NULL) function in ->remove(),
the driver_data will be set to NULL in device_unbind_cleanup()
after calling ->remove().

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/dsa/vitesse-vsc73xx-platform.c | 2 --
 drivers/net/dsa/vitesse-vsc73xx-spi.c      | 2 --
 2 files changed, 4 deletions(-)

diff --git a/drivers/net/dsa/vitesse-vsc73xx-platform.c b/drivers/net/dsa/vitesse-vsc73xx-platform.c
index fe4b154a0a57..bd4206e8f9af 100644
--- a/drivers/net/dsa/vitesse-vsc73xx-platform.c
+++ b/drivers/net/dsa/vitesse-vsc73xx-platform.c
@@ -121,8 +121,6 @@ static int vsc73xx_platform_remove(struct platform_device *pdev)
 
 	vsc73xx_remove(&vsc_platform->vsc);
 
-	platform_set_drvdata(pdev, NULL);
-
 	return 0;
 }
 
diff --git a/drivers/net/dsa/vitesse-vsc73xx-spi.c b/drivers/net/dsa/vitesse-vsc73xx-spi.c
index 97a92e6da60d..85b9a0f51dd8 100644
--- a/drivers/net/dsa/vitesse-vsc73xx-spi.c
+++ b/drivers/net/dsa/vitesse-vsc73xx-spi.c
@@ -167,8 +167,6 @@ static void vsc73xx_spi_remove(struct spi_device *spi)
 		return;
 
 	vsc73xx_remove(&vsc_spi->vsc);
-
-	spi_set_drvdata(spi, NULL);
 }
 
 static void vsc73xx_spi_shutdown(struct spi_device *spi)
-- 
2.25.1

[PATCH net-next 18/18] net: dsa: xrs700x: remove unnecessary dev_set_drvdata()

[Yang Yingliang]

Remove unnecessary dev_set_drvdata() in ->remove(), the driver_data will
be set to NULL in device_unbind_cleanup() after calling ->remove().

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/dsa/xrs700x/xrs700x_mdio.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/dsa/xrs700x/xrs700x_mdio.c b/drivers/net/dsa/xrs700x/xrs700x_mdio.c
index 127a677d1f39..5f7d344b5d73 100644
--- a/drivers/net/dsa/xrs700x/xrs700x_mdio.c
+++ b/drivers/net/dsa/xrs700x/xrs700x_mdio.c
@@ -140,8 +140,6 @@ static void xrs700x_mdio_remove(struct mdio_device *mdiodev)
 		return;
 
 	xrs700x_switch_remove(priv);
-
-	dev_set_drvdata(&mdiodev->dev, NULL);
 }
 
 static void xrs700x_mdio_shutdown(struct mdio_device *mdiodev)
-- 
2.25.1

Re: [PATCH net-next 14/18] net: dsa: realtek: remove unnecessary set_drvdata()

[Alvin Šipraga]

On Wed, Sep 21, 2022 at 10:05:20PM +0800, Yang Yingliang wrote:
> Remove unnecessary set_drvdata(NULL) function in ->remove(),
> the driver_data will be set to NULL in device_unbind_cleanup()
> after calling ->remove().
> 
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> ---
>  drivers/net/dsa/realtek/realtek-mdio.c | 2 --
>  drivers/net/dsa/realtek/realtek-smi.c  | 2 --
>  2 files changed, 4 deletions(-)

Acked-by: Alvin Šipraga <alsi@bang-olufsen.dk>

> 
> diff --git a/drivers/net/dsa/realtek/realtek-mdio.c b/drivers/net/dsa/realtek/realtek-mdio.c
> index c58f49d558d2..3e54fac5f902 100644
> --- a/drivers/net/dsa/realtek/realtek-mdio.c
> +++ b/drivers/net/dsa/realtek/realtek-mdio.c
> @@ -245,8 +245,6 @@ static void realtek_mdio_remove(struct mdio_device *mdiodev)
>  	/* leave the device reset asserted */
>  	if (priv->reset)
>  		gpiod_set_value(priv->reset, 1);
> -
> -	dev_set_drvdata(&mdiodev->dev, NULL);
>  }
>  
>  static void realtek_mdio_shutdown(struct mdio_device *mdiodev)
> diff --git a/drivers/net/dsa/realtek/realtek-smi.c b/drivers/net/dsa/realtek/realtek-smi.c
> index 45992f79ec8d..1b447d96b9c4 100644
> --- a/drivers/net/dsa/realtek/realtek-smi.c
> +++ b/drivers/net/dsa/realtek/realtek-smi.c
> @@ -522,8 +522,6 @@ static int realtek_smi_remove(struct platform_device *pdev)
>  	if (priv->reset)
>  		gpiod_set_value(priv->reset, 1);
>  
> -	platform_set_drvdata(pdev, NULL);
> -
>  	return 0;
>  }
>  
> -- 
> 2.25.1
>

Re: [PATCH net-next 14/18] net: dsa: realtek: remove unnecessary set_drvdata()

[Linus Walleij]

On Wed, Sep 21, 2022 at 3:58 PM Yang Yingliang <yangyingliang@huawei.com> wrote:

> Remove unnecessary set_drvdata(NULL) function in ->remove(),
> the driver_data will be set to NULL in device_unbind_cleanup()
> after calling ->remove().
>
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

Re: [PATCH net-next 04/18] net: dsa: hellcreek: remove unnecessary platform_set_drvdata()

[Kurt Kanzenbach]

[-- Attachment #1: Type: text/plain, Size: 301 bytes --]

On Wed Sep 21 2022, Yang Yingliang wrote:
> Remove unnecessary platform_set_drvdata() in ->remove(), the driver_data
> will be set to NULL in device_unbind_cleanup() after calling ->remove().
>
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Acked-by: Kurt Kanzenbach <kurt@linutronix.de>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 861 bytes --]

Re: [PATCH net-next 17/18] net: dsa: vitesse-vsc73xx: remove unnecessary set_drvdata()

[Linus Walleij]

On Wed, Sep 21, 2022 at 3:58 PM Yang Yingliang <yangyingliang@huawei.com> wrote:

> Remove unnecessary set_drvdata(NULL) function in ->remove(),
> the driver_data will be set to NULL in device_unbind_cleanup()
> after calling ->remove().
>
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

Re: [PATCH 7/18] net: dsa: microchip: remove unnecessary set_drvdata()

[Arun.Ramadoss]

On Wed, 2022-09-21 at 22:05 +0800, Yang Yingliang wrote:
> Remove unnecessary set_drvdata(NULL) function in ->remove(),
> the driver_data will be set to NULL in device_unbind_cleanup()
> after calling ->remove().

Do we need to remove i2c_set_clientdata(i2c, NULL) in ksz9477_i2c.c or
is it applicable only spi and mdio bus.

> 
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> ---
>  drivers/net/dsa/microchip/ksz8863_smi.c | 2 --
>  drivers/net/dsa/microchip/ksz_spi.c     | 2 --
>  2 files changed, 4 deletions(-)
> 
> diff --git a/drivers/net/dsa/microchip/ksz8863_smi.c
> b/drivers/net/dsa/microchip/ksz8863_smi.c
> index 5247fdfb964d..ddb40838181e 100644
> --- a/drivers/net/dsa/microchip/ksz8863_smi.c
> +++ b/drivers/net/dsa/microchip/ksz8863_smi.c
> @@ -180,8 +180,6 @@ static void ksz8863_smi_remove(struct mdio_device
> *mdiodev)
>  
>  	if (dev)
>  		ksz_switch_remove(dev);
> -
> -	dev_set_drvdata(&mdiodev->dev, NULL);
>  }
>  
>  static void ksz8863_smi_shutdown(struct mdio_device *mdiodev)
> diff --git a/drivers/net/dsa/microchip/ksz_spi.c
> b/drivers/net/dsa/microchip/ksz_spi.c
> index 82e2352f55fa..1b6ab891b986 100644
> --- a/drivers/net/dsa/microchip/ksz_spi.c
> +++ b/drivers/net/dsa/microchip/ksz_spi.c
> @@ -107,8 +107,6 @@ static void ksz_spi_remove(struct spi_device
> *spi)
>  
>  	if (dev)
>  		ksz_switch_remove(dev);
> -
> -	spi_set_drvdata(spi, NULL);
>  }
>  
>  static void ksz_spi_shutdown(struct spi_device *spi)
> 

Re: [PATCH 7/18] net: dsa: microchip: remove unnecessary set_drvdata()

[Yang Yingliang]

Hi,

On 2022/9/22 22:12, Arun.Ramadoss@microchip.com wrote:
> On Wed, 2022-09-21 at 22:05 +0800, Yang Yingliang wrote:
>> Remove unnecessary set_drvdata(NULL) function in ->remove(),
>> the driver_data will be set to NULL in device_unbind_cleanup()
>> after calling ->remove().
> Do we need to remove i2c_set_clientdata(i2c, NULL) in ksz9477_i2c.c or
> is it applicable only spi and mdio bus.
Yes, it calls the dev_set_drvdata(), I think it should be remove too.

Thanks,
Yang

Re: [PATCH net-next 02/18] net: dsa: bcm_sf2: remove unnecessary platform_set_drvdata()

[Florian Fainelli]

On 9/21/22 07:05, Yang Yingliang wrote:
> Remove unnecessary platform_set_drvdata() in ->remove(), the driver_data
> will be set to NULL in device_unbind_cleanup() after calling ->remove().
> 
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

Re: [PATCH net-next 03/18] net: dsa: loop: remove unnecessary dev_set_drvdata()

[Florian Fainelli]

On 9/21/22 07:05, Yang Yingliang wrote:
> Remove unnecessary dev_set_drvdata() in ->remove(), the driver_data will
> be set to NULL in device_unbind_cleanup() after calling ->remove().
> 
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Acked-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

Re: [PATCH net-next 00/18] net: dsa: remove unnecessary set_drvdata()

[patchwork-bot+netdevbpf]

Hello:

This series was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:

On Wed, 21 Sep 2022 22:05:06 +0800 you wrote:
> In this patch set, I removed all set_drvdata(NULL) functions in ->remove() in
> drivers/net/dsa/.
> 
> The driver_data will be set to NULL in device_unbind_cleanup() after calling ->remove(),
> so all set_drvdata(NULL) functions in ->remove() is redundant, they can be removed.
> 
> Here is the previous patch set:
> https://lore.kernel.org/netdev/facfc855-d082-cc1c-a0bc-027f562a2f45@huawei.com/T/
> 
> [...]

Here is the summary with links:
  - [net-next,01/18] net: dsa: b53: remove unnecessary set_drvdata()
    https://git.kernel.org/netdev/net-next/c/764a73b43c36
  - [net-next,02/18] net: dsa: bcm_sf2: remove unnecessary platform_set_drvdata()
    https://git.kernel.org/netdev/net-next/c/47f6aa145036
  - [net-next,03/18] net: dsa: loop: remove unnecessary dev_set_drvdata()
    https://git.kernel.org/netdev/net-next/c/c1816b201415
  - [net-next,04/18] net: dsa: hellcreek: remove unnecessary platform_set_drvdata()
    https://git.kernel.org/netdev/net-next/c/8668cfc6db48
  - [net-next,05/18] net: dsa: lan9303: remove unnecessary dev_set_drvdata()
    https://git.kernel.org/netdev/net-next/c/2697085007f0
  - [net-next,06/18] net: dsa: lantiq_gswip: remove unnecessary platform_set_drvdata()
    https://git.kernel.org/netdev/net-next/c/f6ddabca45f6
  - [net-next,07/18] net: dsa: microchip: remove unnecessary set_drvdata()
    https://git.kernel.org/netdev/net-next/c/3525ecc127d8
  - [net-next,08/18] net: dsa: mt7530: remove unnecessary dev_set_drvdata()
    https://git.kernel.org/netdev/net-next/c/ebe48922c0c4
  - [net-next,09/18] net: dsa: mv88e6060: remove unnecessary dev_set_drvdata()
    https://git.kernel.org/netdev/net-next/c/92f529b7a3b7
  - [net-next,10/18] net: dsa: mv88e6xxx: remove unnecessary dev_set_drvdata()
    https://git.kernel.org/netdev/net-next/c/b25a575c9cd0
  - [net-next,11/18] net: dsa: ocelot: remove unnecessary set_drvdata()
    https://git.kernel.org/netdev/net-next/c/f66d1ecc1ad4
  - [net-next,12/18] net: dsa: ar9331: remove unnecessary dev_set_drvdata()
    https://git.kernel.org/netdev/net-next/c/14b29ece30e5
  - [net-next,13/18] net: dsa: qca8k: remove unnecessary dev_set_drvdata()
    https://git.kernel.org/netdev/net-next/c/68c4e297e09c
  - [net-next,14/18] net: dsa: realtek: remove unnecessary set_drvdata()
    https://git.kernel.org/netdev/net-next/c/24d64ced1bf8
  - [net-next,15/18] net: dsa: rzn1-a5psw: remove unnecessary platform_set_drvdata()
    https://git.kernel.org/netdev/net-next/c/4f6ee77aebf1
  - [net-next,16/18] net: dsa: sja1105: remove unnecessary spi_set_drvdata()
    https://git.kernel.org/netdev/net-next/c/ee08bf0d0a3a
  - [net-next,17/18] net: dsa: vitesse-vsc73xx: remove unnecessary set_drvdata()
    https://git.kernel.org/netdev/net-next/c/774b060debb1
  - [net-next,18/18] net: dsa: xrs700x: remove unnecessary dev_set_drvdata()
    https://git.kernel.org/netdev/net-next/c/24aeeb107f07

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html