2013-08-12 13:26:05

by Libo Chen

[permalink] [raw]

Subject: [PATCH 7/8] net: xilinx_emaclite: use platform_{get,set}_drvdata()

---

Use the wrapper functions for getting and setting the driver data using
platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev,
so we can directly pass a struct platform_device.

Signed-off-by: Libo Chen <[email protected]>
---
drivers/net/ethernet/xilinx/xilinx_emaclite.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
index fd4dbda..4c619ea 100644
--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@ -1230,8 +1230,7 @@ error:
*/
static int xemaclite_of_remove(struct platform_device *of_dev)
{
- struct device *dev = &of_dev->dev;
- struct net_device *ndev = dev_get_drvdata(dev);
+ struct net_device *ndev = platform_get_drvdata(of_dev);

struct net_local *lp = netdev_priv(ndev);

@@ -1250,7 +1249,6 @@ static int xemaclite_of_remove(struct platform_device *of_dev)
lp->phy_node = NULL;

xemaclite_remove_ndev(ndev, of_dev);
- dev_set_drvdata(dev, NULL);

return 0;
}
--
1.7.1

2013-08-12 13:28:34

by Michal Simek

[permalink] [raw]

Subject: Re: [PATCH 7/8] net: xilinx_emaclite: use platform_{get,set}_drvdata()

---

On 08/12/2013 03:25 PM, Libo Chen wrote:
>
> Use the wrapper functions for getting and setting the driver data using
> platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev,
> so we can directly pass a struct platform_device.
>
> Signed-off-by: Libo Chen <[email protected]>
> ---
> drivers/net/ethernet/xilinx/xilinx_emaclite.c | 4 +---
> 1 files changed, 1 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
> index fd4dbda..4c619ea 100644
> --- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
> +++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
> @@ -1230,8 +1230,7 @@ error:
> */
> static int xemaclite_of_remove(struct platform_device *of_dev)
> {
> - struct device *dev = &of_dev->dev;
> - struct net_device *ndev = dev_get_drvdata(dev);
> + struct net_device *ndev = platform_get_drvdata(of_dev);
>
> struct net_local *lp = netdev_priv(ndev);
>
> @@ -1250,7 +1249,6 @@ static int xemaclite_of_remove(struct platform_device *of_dev)
> lp->phy_node = NULL;
>
> xemaclite_remove_ndev(ndev, of_dev);
> - dev_set_drvdata(dev, NULL);
>
> return 0;
> }
>

Acked-by: Michal Simek <[email protected]>

Thanks,
Michal

--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform

---

Attachments:

signature.asc (263.00 B)
OpenPGP digital signature

2013-08-14 03:41:00

by Libo Chen

[permalink] [raw]

Subject: [PATCH RESEND 7/8] net: xilinx_emaclite: use platform_{get,set}_drvdata()

---

We can use the wrapper functions platform_{get,set}_drvdata() instead of
dev_{get,set}_drvdata() with &of_dev->dev, it is convenient for user.

Also, unnecessary dev_set_drvdata() is removed, because the driver core
clears the driver data to NULL after device_release or on probe failure.

Signed-off-by: Libo Chen <[email protected]>
---
drivers/net/ethernet/xilinx/xilinx_emaclite.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
index fd4dbda..4c619ea 100644
--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@ -1230,8 +1230,7 @@ error:
*/
static int xemaclite_of_remove(struct platform_device *of_dev)
{
- struct device *dev = &of_dev->dev;
- struct net_device *ndev = dev_get_drvdata(dev);
+ struct net_device *ndev = platform_get_drvdata(of_dev);

struct net_local *lp = netdev_priv(ndev);

@@ -1250,7 +1249,6 @@ static int xemaclite_of_remove(struct platform_device *of_dev)
lp->phy_node = NULL;

xemaclite_remove_ndev(ndev, of_dev);
- dev_set_drvdata(dev, NULL);

return 0;
}
--
1.7.1

2013-08-19 07:09:15

by Michal Simek

[permalink] [raw]

Subject: Re: [PATCH RESEND 7/8] net: xilinx_emaclite: use platform_{get,set}_drvdata()

---

On 08/14/2013 05:40 AM, Libo Chen wrote:
>
> We can use the wrapper functions platform_{get,set}_drvdata() instead of
> dev_{get,set}_drvdata() with &of_dev->dev, it is convenient for user.
>
> Also, unnecessary dev_set_drvdata() is removed, because the driver core
> clears the driver data to NULL after device_release or on probe failure.
>
> Signed-off-by: Libo Chen <[email protected]>

Acked-by: Michal Simek <[email protected]>

Thanks,
Michal

--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform

---

Attachments:

signature.asc (263.00 B)
OpenPGP digital signature