2013-08-12 13:25:18

by Libo Chen

[permalink] [raw]
Subject: [PATCH 4/8] net: fs_enet: 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]>
---
.../net/ethernet/freescale/fs_enet/fs_enet-main.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
index 8de53a1..7e3de10 100644
--- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
@@ -1122,7 +1122,6 @@ static int fs_enet_remove(struct platform_device *ofdev)

fep->ops->free_bd(ndev);
fep->ops->cleanup_data(ndev);
- dev_set_drvdata(fep->dev, NULL);
of_node_put(fep->fpi->phy_node);
free_netdev(ndev);
return 0;
--
1.7.1


2013-08-12 18:16:07

by Sergei Shtylyov

[permalink] [raw]
Subject: Re: [PATCH 4/8] net: fs_enet: use platform_{get,set}_drvdata()

On 08/12/2013 05:24 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]>
> ---
> .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)

> diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
> index 8de53a1..7e3de10 100644
> --- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
> +++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
> @@ -1122,7 +1122,6 @@ static int fs_enet_remove(struct platform_device *ofdev)
>
> fep->ops->free_bd(ndev);
> fep->ops->cleanup_data(ndev);
> - dev_set_drvdata(fep->dev, NULL);
> of_node_put(fep->fpi->phy_node);
> free_netdev(ndev);
> return 0;

Changelog simply doesn't match the patch.

WBR, Sergei

2013-08-14 03:40:08

by Libo Chen

[permalink] [raw]
Subject: [PATCH RESEND 4/8] net: fs_enet: remove unnecessary dev_set_drvdata()


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/freescale/fs_enet/fs_enet-main.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
index 8de53a1..7e3de10 100644
--- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
@@ -1122,7 +1122,6 @@ static int fs_enet_remove(struct platform_device *ofdev)

fep->ops->free_bd(ndev);
fep->ops->cleanup_data(ndev);
- dev_set_drvdata(fep->dev, NULL);
of_node_put(fep->fpi->phy_node);
free_netdev(ndev);
return 0;
--
1.7.1