Skip to contentSkip to conversation

watchdog: use dev_get_platdata()

PATCH In review Jingoo Han 3 participants 3 messages Jul 30, 2013 – Oct 29, 2013

Subsystems (3)
Arm STM32 Watchdog device drivers Wolfson microelectronics drivers
lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH v2 3/35 watchdog: use dev_get_platdata()

Use the wrapper function for retrieving the platform data instead of accessing dev->platform_data directly.

Signed-off-by Jingoo Han <[email protected]>
---
 drivers/watchdog/iTCO_wdt.c         |    2 +-
 drivers/watchdog/mv64x60_wdt.c      |    2 +-
 drivers/watchdog/omap_wdt.c         |    2 +-
 drivers/watchdog/rdc321x_wdt.c      |    2 +-
 drivers/watchdog/stmp3xxx_rtc_wdt.c |    4 ++--
 drivers/watchdog/ux500_wdt.c        |    2 +-
 drivers/watchdog/wm831x_wdt.c       |    8 +++-----
 7 files changed, 10 insertions(+), 12 deletions(-)
drivers/watchdog/iTCO_wdt.c +1 -1
index 6130321..439b160 100644
@@ -394,7 +394,7 @@ static int iTCO_wdt_probe(struct platform_device *dev)
 {
 	int ret = -ENODEV;
 	unsigned long val32;
-	struct lpc_ich_info *ich_info = dev->dev.platform_data;
+	struct lpc_ich_info *ich_info = dev_get_platdata(&dev->dev);
 
 	if (!ich_info)
 		goto out;
drivers/watchdog/mv64x60_wdt.c +1 -1
index e4cf980..2f2ff19 100644
@@ -255,7 +255,7 @@ static struct miscdevice mv64x60_wdt_miscdev = {
 
 static int mv64x60_wdt_probe(struct platform_device *dev)
 {
-	struct mv64x60_wdt_pdata *pdata = dev->dev.platform_data;
+	struct mv64x60_wdt_pdata *pdata = dev_get_platdata(&dev->dev);
 	struct resource *r;
 	int timeout = 10;
drivers/watchdog/omap_wdt.c +1 -1
index af88ffd..7b79ca0 100644
@@ -205,7 +205,7 @@ static const struct watchdog_ops omap_wdt_ops = {
 
 static int omap_wdt_probe(struct platform_device *pdev)
 {
-	struct omap_wd_timer_platform_data *pdata = pdev->dev.platform_data;
+	struct omap_wd_timer_platform_data *pdata = dev_get_platdata(&pdev->dev);
 	struct watchdog_device *omap_wdt;
 	struct resource *res, *mem;
 	struct omap_wdt_dev *wdev;
drivers/watchdog/rdc321x_wdt.c +1 -1
index b0f116c..8d5facd 100644
@@ -231,7 +231,7 @@ static int rdc321x_wdt_probe(struct platform_device *pdev)
 	struct resource *r;
 	struct rdc321x_wdt_pdata *pdata;
 
-	pdata = pdev->dev.platform_data;
+	pdata = dev_get_platdata(&pdev->dev);
 	if (!pdata) {
 		dev_err(&pdev->dev, "no platform data supplied\n");
 		return -ENODEV;
drivers/watchdog/stmp3xxx_rtc_wdt.c +2 -2
index c97e98d..7bf8c50 100644
@@ -30,7 +30,7 @@ MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat period in seconds from 1 to "
 static int wdt_start(struct watchdog_device *wdd)
 {
 	struct device *dev = watchdog_get_drvdata(wdd);
-	struct stmp3xxx_wdt_pdata *pdata = dev->platform_data;
+	struct stmp3xxx_wdt_pdata *pdata = dev_get_platdata(dev);
 
 	pdata->wdt_set_timeout(dev->parent, wdd->timeout * WDOG_TICK_RATE);
 	return 0;

@@ -39,7 +39,7 @@ static int wdt_start(struct watchdog_device *wdd)
 static int wdt_stop(struct watchdog_device *wdd)
 {
 	struct device *dev = watchdog_get_drvdata(wdd);
-	struct stmp3xxx_wdt_pdata *pdata = dev->platform_data;
+	struct stmp3xxx_wdt_pdata *pdata = dev_get_platdata(dev);
 
 	pdata->wdt_set_timeout(dev->parent, 0);
 	return 0;
drivers/watchdog/ux500_wdt.c +1 -1
index a614d84..d9af934 100644
@@ -88,7 +88,7 @@ static struct watchdog_device ux500_wdt = {
 static int ux500_wdt_probe(struct platform_device *pdev)
 {
 	int ret;
-	struct ux500_wdt_data *pdata = pdev->dev.platform_data;
+	struct ux500_wdt_data *pdata = dev_get_platdata(&pdev->dev);
 
 	if (pdata) {
 		if (pdata->timeout > 0)
drivers/watchdog/wm831x_wdt.c +3 -5
index d4e47ed..e243bd0 100644
@@ -184,7 +184,7 @@ static const struct watchdog_ops wm831x_wdt_ops = {
 static int wm831x_wdt_probe(struct platform_device *pdev)
 {
 	struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
-	struct wm831x_pdata *chip_pdata;
+	struct wm831x_pdata *chip_pdata = dev_get_platdata(pdev->dev.parent);
 	struct wm831x_watchdog_pdata *pdata;
 	struct wm831x_wdt_drvdata *driver_data;
 	struct watchdog_device *wm831x_wdt;

@@ -231,12 +231,10 @@ static int wm831x_wdt_probe(struct platform_device *pdev)
 		wm831x_wdt->timeout = wm831x_wdt_cfgs[i].time;
 
 	/* Apply any configuration */
-	if (pdev->dev.parent->platform_data) {
-		chip_pdata = pdev->dev.parent->platform_data;
+	if (chip_pdata)
 		pdata = chip_pdata->watchdog;
-	} else {
+	else
 		pdata = NULL;
-	}
 
 	if (pdata) {
 		reg &= ~(WM831X_WDOG_SECACT_MASK | WM831X_WDOG_PRIMACT_MASK |
Signature · 1 line
1.7.10.4
#2 lore raw
In reply to Jingoo Han

Hi Jingoo,

Quoted 4 lines

Use the wrapper function for retrieving the platform data instead of accessing dev->platform_data directly.

Signed-off-by Jingoo Han <[email protected]>
Quoted 9 lines
---
 drivers/watchdog/iTCO_wdt.c         |    2 +-
 drivers/watchdog/mv64x60_wdt.c      |    2 +-
 drivers/watchdog/omap_wdt.c         |    2 +-
 drivers/watchdog/rdc321x_wdt.c      |    2 +-
 drivers/watchdog/stmp3xxx_rtc_wdt.c |    4 ++--
 drivers/watchdog/ux500_wdt.c        |    2 +-
 drivers/watchdog/wm831x_wdt.c       |    8 +++-----
 7 files changed, 10 insertions(+), 12 deletions(-)

This patch has been added to linux-watchdog-next.

Kind regards,
Wim.