LinuxLists.cc - [PATCH 0/11] wireless: remove unnecessary pci_set

2013-09-10 11:14:33

Subject: [PATCH 0/11] wireless: remove unnecessary pci_set_drvdata()

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.

---
drivers/net/wireless/adm8211.c | 1 -
drivers/net/wireless/airo.c | 1 -
drivers/net/wireless/ath/ath10k/pci.c | 2 --
drivers/net/wireless/ath/wil6210/pcie_bus.c | 1 -
drivers/net/wireless/ipw2x00/ipw2200.c | 2 --
drivers/net/wireless/iwlegacy/3945-mac.c | 2 --
drivers/net/wireless/iwlegacy/4965-mac.c | 2 --
drivers/net/wireless/iwlwifi/pcie/drv.c | 3 ---
drivers/net/wireless/mwl8k.c | 2 --
drivers/net/wireless/orinoco/orinoco_nortel.c | 2 --
drivers/net/wireless/orinoco/orinoco_pci.c | 2 --
drivers/net/wireless/orinoco/orinoco_plx.c | 2 --
drivers/net/wireless/orinoco/orinoco_tmd.c | 2 --
drivers/net/wireless/p54/p54pci.c | 1 -
drivers/net/wireless/rtl818x/rtl8180/dev.c | 1 -
drivers/net/wireless/rtlwifi/pci.c | 3 ---
16 files changed, 29 deletions(-)

2013-09-11 00:32:53

by Jingoo Han

[permalink] [raw]

Subject: Re: [PATCH 06/12] wireless: ath10k: remove unnecessary pci_set_drvdata()

On Wednesday, September 11, 2013 6:57 AM, Kalle Valo wrote:
> Jingoo Han <[email protected]> writes:
>
> > 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 <[email protected]>
>
> Thanks, look good. Do you want me to apply this to my ath.git tree or
> are you planning to send this via some other route?
>

Hi Kalle Valo,

It would be good that you apply this to your ath.git tree.
Thank you. :-)

Best regards,
Jingoo Han

2013-09-10 11:27:51

by Jingoo Han

[permalink] [raw]

Subject: [PATCH 09/12] wireless: mwl8k: remove unnecessary pci_set_drvdata()

2013-09-10 11:16:29

by Jingoo Han

[permalink] [raw]

Subject: [PATCH 01/12] wireless: iwlwifi: remove unnecessary pci_set_drvdata()

2013-09-10 11:30:50

by Jingoo Han

[permalink] [raw]

Subject: [PATCH 11/12] wireless: p54pci: remove unnecessary pci_set_drvdata()

2013-09-10 11:27:10

by Jingoo Han

[permalink] [raw]

Subject: [PATCH 08/12] wireless: ipw2x00: 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 <[email protected]>
---
drivers/net/wireless/ipw2x00/ipw2200.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 6b823a1..f394af7 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -11885,7 +11885,6 @@ static int ipw_pci_probe(struct pci_dev *pdev,
pci_release_regions(pdev);
out_pci_disable_device:
pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
out_free_libipw:
free_libipw(priv->net_dev, 0);
out:
@@ -11966,7 +11965,6 @@ static void ipw_pci_remove(struct pci_dev *pdev)
iounmap(priv->hw_base);
pci_release_regions(pdev);
pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
/* wiphy_unregister needs to be here, before free_libipw */
wiphy_unregister(priv->ieee->wdev.wiphy);
kfree(priv->ieee->a_band.channels);
--
1.7.10.4

2013-09-10 11:29:28

by Jingoo Han

[permalink] [raw]

Subject: [PATCH 10/12] wireless: orinoco: 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 <[email protected]>
---
drivers/net/wireless/orinoco/orinoco_nortel.c | 2 --
drivers/net/wireless/orinoco/orinoco_pci.c | 2 --
drivers/net/wireless/orinoco/orinoco_plx.c | 2 --
drivers/net/wireless/orinoco/orinoco_tmd.c | 2 --
4 files changed, 8 deletions(-)

diff --git a/drivers/net/wireless/orinoco/orinoco_nortel.c b/drivers/net/wireless/orinoco/orinoco_nortel.c
index d73fdf6..ffb2469 100644
--- a/drivers/net/wireless/orinoco/orinoco_nortel.c
+++ b/drivers/net/wireless/orinoco/orinoco_nortel.c
@@ -234,7 +234,6 @@ static int orinoco_nortel_init_one(struct pci_dev *pdev,
free_irq(pdev->irq, priv);

fail_irq:
- pci_set_drvdata(pdev, NULL);
free_orinocodev(priv);

fail_alloc:
@@ -265,7 +264,6 @@ static void orinoco_nortel_remove_one(struct pci_dev *pdev)

orinoco_if_del(priv);
free_irq(pdev->irq, priv);
- pci_set_drvdata(pdev, NULL);
free_orinocodev(priv);
pci_iounmap(pdev, priv->hw.iobase);
pci_iounmap(pdev, card->attr_io);
diff --git a/drivers/net/wireless/orinoco/orinoco_pci.c b/drivers/net/wireless/orinoco/orinoco_pci.c
index 677bf14..5ae1191 100644
--- a/drivers/net/wireless/orinoco/orinoco_pci.c
+++ b/drivers/net/wireless/orinoco/orinoco_pci.c
@@ -184,7 +184,6 @@ static int orinoco_pci_init_one(struct pci_dev *pdev,
free_irq(pdev->irq, priv);

fail_irq:
- pci_set_drvdata(pdev, NULL);
free_orinocodev(priv);

fail_alloc:
@@ -205,7 +204,6 @@ static void orinoco_pci_remove_one(struct pci_dev *pdev)

orinoco_if_del(priv);
free_irq(pdev->irq, priv);
- pci_set_drvdata(pdev, NULL);
free_orinocodev(priv);
pci_iounmap(pdev, priv->hw.iobase);
pci_release_regions(pdev);
diff --git a/drivers/net/wireless/orinoco/orinoco_plx.c b/drivers/net/wireless/orinoco/orinoco_plx.c
index 2559dbd..bbd36d1 100644
--- a/drivers/net/wireless/orinoco/orinoco_plx.c
+++ b/drivers/net/wireless/orinoco/orinoco_plx.c
@@ -273,7 +273,6 @@ static int orinoco_plx_init_one(struct pci_dev *pdev,
free_irq(pdev->irq, priv);

fail_irq:
- pci_set_drvdata(pdev, NULL);
free_orinocodev(priv);

fail_alloc:
@@ -301,7 +300,6 @@ static void orinoco_plx_remove_one(struct pci_dev *pdev)

orinoco_if_del(priv);
free_irq(pdev->irq, priv);
- pci_set_drvdata(pdev, NULL);
free_orinocodev(priv);
pci_iounmap(pdev, priv->hw.iobase);
pci_iounmap(pdev, card->attr_io);
diff --git a/drivers/net/wireless/orinoco/orinoco_tmd.c b/drivers/net/wireless/orinoco/orinoco_tmd.c
index 42afeee..04b08de 100644
--- a/drivers/net/wireless/orinoco/orinoco_tmd.c
+++ b/drivers/net/wireless/orinoco/orinoco_tmd.c
@@ -170,7 +170,6 @@ static int orinoco_tmd_init_one(struct pci_dev *pdev,
free_irq(pdev->irq, priv);

fail_irq:
- pci_set_drvdata(pdev, NULL);
free_orinocodev(priv);

fail_alloc:
@@ -195,7 +194,6 @@ static void orinoco_tmd_remove_one(struct pci_dev *pdev)

orinoco_if_del(priv);
free_irq(pdev->irq, priv);
- pci_set_drvdata(pdev, NULL);
free_orinocodev(priv);
pci_iounmap(pdev, priv->hw.iobase);
pci_iounmap(pdev, card->bridge_io);
--
1.7.10.4

2013-09-10 14:34:22

by Larry Finger

[permalink] [raw]

Subject: Re: [PATCH 02/12] wireless: rtlwifi: remove unnecessary pci_set_drvdata()

On 09/10/2013 06:18 AM, Jingoo Han 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 <[email protected]>
> ---
> drivers/net/wireless/rtlwifi/pci.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
> index 703f839..2b6d3e0 100644
> --- a/drivers/net/wireless/rtlwifi/pci.c
> +++ b/drivers/net/wireless/rtlwifi/pci.c
> @@ -2009,7 +2009,6 @@ fail2:
> fail1:
> if (hw)
> ieee80211_free_hw(hw);
> - pci_set_drvdata(pdev, NULL);
> pci_disable_device(pdev);
>
> return err;
> @@ -2064,8 +2063,6 @@ void rtl_pci_disconnect(struct pci_dev *pdev)
>
> rtl_pci_disable_aspm(hw);
>
> - pci_set_drvdata(pdev, NULL);
> -
> ieee80211_free_hw(hw);
> }
> EXPORT_SYMBOL(rtl_pci_disconnect);
>

Acked-by: Larry Finger <[email protected]>

Thanks,

Larry

2013-09-10 11:30:32

by Emmanuel Grumbach

[permalink] [raw]

Subject: Re: [PATCH 01/12] wireless: iwlwifi: remove unnecessary pci_set_drvdata()

On Tue, Sep 10, 2013 at 2:16 PM, Jingoo Han <[email protected]> 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 <[email protected]>
> ---
> drivers/net/wireless/iwlwifi/pcie/drv.c | 3 ---
> 1 file changed, 3 deletions(-)
>

I picked it up - thanks.

2013-09-10 11:19:42

by Jingoo Han

[permalink] [raw]

Subject: [PATCH 03/12] wireless: iwlegacy: remove unnecessary pci_set_drvdata()

2013-09-10 11:18:39

by Jingoo Han

[permalink] [raw]

Subject: [PATCH 02/12] wireless: rtlwifi: 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 <[email protected]>
---
drivers/net/wireless/rtlwifi/pci.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 703f839..2b6d3e0 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -2009,7 +2009,6 @@ fail2:
fail1:
if (hw)
ieee80211_free_hw(hw);
- pci_set_drvdata(pdev, NULL);
pci_disable_device(pdev);

return err;
@@ -2064,8 +2063,6 @@ void rtl_pci_disconnect(struct pci_dev *pdev)

rtl_pci_disable_aspm(hw);

- pci_set_drvdata(pdev, NULL);
-
ieee80211_free_hw(hw);
}
EXPORT_SYMBOL(rtl_pci_disconnect);
--
1.7.10.4

2013-09-10 11:32:20

by Jingoo Han

[permalink] [raw]

Subject: [PATCH 12/12] wireless: rtl818x: 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 <[email protected]>
---
drivers/net/wireless/rtl818x/rtl8180/dev.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/net/wireless/rtl818x/rtl8180/dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c
index fc207b2..a91506b 100644
--- a/drivers/net/wireless/rtl818x/rtl8180/dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c
@@ -1122,7 +1122,6 @@ static int rtl8180_probe(struct pci_dev *pdev,
iounmap(priv->map);

err_free_dev:
- pci_set_drvdata(pdev, NULL);
ieee80211_free_hw(dev);

err_free_reg:
--
1.7.10.4

2013-09-12 16:23:24

by Kalle Valo

[permalink] [raw]

Subject: Re: [PATCH 06/12] wireless: ath10k: remove unnecessary pci_set_drvdata()

Jingoo Han <[email protected]> writes:

> 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 <[email protected]>

Thanks, applied.

--
Kalle Valo

2013-09-10 11:25:17

by Jingoo Han

[permalink] [raw]

Subject: [PATCH 06/12] wireless: ath10k: 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 <[email protected]>
---
drivers/net/wireless/ath/ath10k/pci.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index e2f9ef5..5ef0422 100644
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -2414,7 +2414,6 @@ err_region:
err_device:
pci_disable_device(pdev);
err_ar:
- pci_set_drvdata(pdev, NULL);
ath10k_core_destroy(ar);
err_ar_pci:
/* call HIF PCI free here */
@@ -2442,7 +2441,6 @@ static void ath10k_pci_remove(struct pci_dev *pdev)

ath10k_core_unregister(ar);

- pci_set_drvdata(pdev, NULL);
pci_iounmap(pdev, ar_pci->mem);
pci_release_region(pdev, BAR_NUM);
pci_clear_master(pdev);
--
1.7.10.4

2013-09-10 11:23:52

by Jingoo Han

[permalink] [raw]

Subject: [PATCH 05/12] wireless: airo: remove unnecessary pci_set_drvdata()

2013-09-15 07:46:54

by Vladimir Kondratiev

[permalink] [raw]

Subject: Re: [PATCH 07/12] wireless: wil6210: remove unnecessary pci_set_drvdata()

On Tuesday, September 10, 2013 08:26:13 PM Jingoo Han 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 <[email protected]>
> ---
> drivers/net/wireless/ath/wil6210/pcie_bus.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/net/wireless/ath/wil6210/pcie_bus.c b/drivers/net/wireless/ath/wil6210/pcie_bus.c
> index eb1dc7a..eeceab3 100644
> --- a/drivers/net/wireless/ath/wil6210/pcie_bus.c
> +++ b/drivers/net/wireless/ath/wil6210/pcie_bus.c
> @@ -197,7 +197,6 @@ static void wil_pcie_remove(struct pci_dev *pdev)
> pci_iounmap(pdev, wil->csr);
> pci_release_region(pdev, 0);
> pci_disable_device(pdev);
> - pci_set_drvdata(pdev, NULL);
> }
>
> static DEFINE_PCI_DEVICE_TABLE(wil6210_pcie_ids) = {
>

Here is my

Acked-by: Vladimir Kondratiev <[email protected]>

2013-09-10 11:26:14

by Jingoo Han

[permalink] [raw]

Subject: [PATCH 07/12] wireless: wil6210: 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 <[email protected]>
---
drivers/net/wireless/ath/wil6210/pcie_bus.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/net/wireless/ath/wil6210/pcie_bus.c b/drivers/net/wireless/ath/wil6210/pcie_bus.c
index eb1dc7a..eeceab3 100644
--- a/drivers/net/wireless/ath/wil6210/pcie_bus.c
+++ b/drivers/net/wireless/ath/wil6210/pcie_bus.c
@@ -197,7 +197,6 @@ static void wil_pcie_remove(struct pci_dev *pdev)
pci_iounmap(pdev, wil->csr);
pci_release_region(pdev, 0);
pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
}

static DEFINE_PCI_DEVICE_TABLE(wil6210_pcie_ids) = {
--
1.7.10.4

2013-09-10 11:22:12

by Jingoo Han

[permalink] [raw]

Subject: [PATCH 04/12] wireless: adm8211: remove unnecessary pci_set_drvdata()

2013-09-10 21:56:45

by Kalle Valo

[permalink] [raw]