Skip to contentSkip to conversation

watchdog: wm831x: use platform_{get,set}_drvdata()

PATCH In review Jingoo Han 3 participants 3 messages May 23, 2013 – May 26, 2013

Subsystems (2)
lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH 5/5 watchdog: wm831x: 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.

---
 drivers/watchdog/wm831x_wdt.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/watchdog/wm831x_wdt.c +2 -2
index 9dcb6d0..6c302fd 100644
@@ -281,7 +281,7 @@ static int wm831x_wdt_probe(struct platform_device *pdev)
 		goto err_gpio;
 	}
 
-	dev_set_drvdata(&pdev->dev, driver_data);
+	platform_set_drvdata(pdev, driver_data);
 
 	return 0;
 
@@ -294,7 +294,7 @@ err:
 
 static int wm831x_wdt_remove(struct platform_device *pdev)
 {
-	struct wm831x_wdt_drvdata *driver_data = dev_get_drvdata(&pdev->dev);
+	struct wm831x_wdt_drvdata *driver_data = platform_get_drvdata(pdev);
 
 	watchdog_unregister_device(&driver_data->wdt);
 
Signature · 1 line
1.7.10.4
maintainer Reviewed-by on v1 5/5
#1 lore raw
Quoted 5 lines · Jingoo Han

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.

Quoted 31 lines
---
 drivers/watchdog/wm831x_wdt.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/watchdog/wm831x_wdt.c +2 -2
index 9dcb6d0..6c302fd 100644
@@ -281,7 +281,7 @@ static int wm831x_wdt_probe(struct platform_device *pdev)
 		goto err_gpio;
 	}
 
-	dev_set_drvdata(&pdev->dev, driver_data);
+	platform_set_drvdata(pdev, driver_data);
 
 	return 0;
 
@@ -294,7 +294,7 @@ err:
 
 static int wm831x_wdt_remove(struct platform_device *pdev)
 {
-	struct wm831x_wdt_drvdata *driver_data = dev_get_drvdata(&pdev->dev);
+	struct wm831x_wdt_drvdata *driver_data = platform_get_drvdata(pdev);
 
 	watchdog_unregister_device(&driver_data->wdt);
 
Signature · 1 line
1.7.10.4
#2 lore raw
In reply to Jingoo Han

Hi Jingoo,

Quoted 9 lines

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.

---
 drivers/watchdog/wm831x_wdt.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch added to linux-watchdog-next.

Kind regards,
Wim.