tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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 <jg1.han@samsung.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

authored by

Jingoo Han and committed by
Wim Van Sebroeck bc8fdfbe 813296a1

+10 -12
+1 -1
drivers/watchdog/iTCO_wdt.c
··· 394 394 { 395 395 int ret = -ENODEV; 396 396 unsigned long val32; 397 - struct lpc_ich_info *ich_info = dev->dev.platform_data; 397 + struct lpc_ich_info *ich_info = dev_get_platdata(&dev->dev); 398 398 399 399 if (!ich_info) 400 400 goto out;
+1 -1
drivers/watchdog/mv64x60_wdt.c
··· 255 255 256 256 static int mv64x60_wdt_probe(struct platform_device *dev) 257 257 { 258 - struct mv64x60_wdt_pdata *pdata = dev->dev.platform_data; 258 + struct mv64x60_wdt_pdata *pdata = dev_get_platdata(&dev->dev); 259 259 struct resource *r; 260 260 int timeout = 10; 261 261
+1 -1
drivers/watchdog/omap_wdt.c
··· 205 205 206 206 static int omap_wdt_probe(struct platform_device *pdev) 207 207 { 208 - struct omap_wd_timer_platform_data *pdata = pdev->dev.platform_data; 208 + struct omap_wd_timer_platform_data *pdata = dev_get_platdata(&pdev->dev); 209 209 struct watchdog_device *omap_wdt; 210 210 struct resource *res, *mem; 211 211 struct omap_wdt_dev *wdev;
+1 -1
drivers/watchdog/rdc321x_wdt.c
··· 231 231 struct resource *r; 232 232 struct rdc321x_wdt_pdata *pdata; 233 233 234 - pdata = pdev->dev.platform_data; 234 + pdata = dev_get_platdata(&pdev->dev); 235 235 if (!pdata) { 236 236 dev_err(&pdev->dev, "no platform data supplied\n"); 237 237 return -ENODEV;
+2 -2
drivers/watchdog/stmp3xxx_rtc_wdt.c
··· 30 30 static int wdt_start(struct watchdog_device *wdd) 31 31 { 32 32 struct device *dev = watchdog_get_drvdata(wdd); 33 - struct stmp3xxx_wdt_pdata *pdata = dev->platform_data; 33 + struct stmp3xxx_wdt_pdata *pdata = dev_get_platdata(dev); 34 34 35 35 pdata->wdt_set_timeout(dev->parent, wdd->timeout * WDOG_TICK_RATE); 36 36 return 0; ··· 39 39 static int wdt_stop(struct watchdog_device *wdd) 40 40 { 41 41 struct device *dev = watchdog_get_drvdata(wdd); 42 - struct stmp3xxx_wdt_pdata *pdata = dev->platform_data; 42 + struct stmp3xxx_wdt_pdata *pdata = dev_get_platdata(dev); 43 43 44 44 pdata->wdt_set_timeout(dev->parent, 0); 45 45 return 0;
+1 -1
drivers/watchdog/ux500_wdt.c
··· 88 88 static int ux500_wdt_probe(struct platform_device *pdev) 89 89 { 90 90 int ret; 91 - struct ux500_wdt_data *pdata = pdev->dev.platform_data; 91 + struct ux500_wdt_data *pdata = dev_get_platdata(&pdev->dev); 92 92 93 93 if (pdata) { 94 94 if (pdata->timeout > 0)
+3 -5
drivers/watchdog/wm831x_wdt.c
··· 184 184 static int wm831x_wdt_probe(struct platform_device *pdev) 185 185 { 186 186 struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent); 187 - struct wm831x_pdata *chip_pdata; 187 + struct wm831x_pdata *chip_pdata = dev_get_platdata(pdev->dev.parent); 188 188 struct wm831x_watchdog_pdata *pdata; 189 189 struct wm831x_wdt_drvdata *driver_data; 190 190 struct watchdog_device *wm831x_wdt; ··· 231 231 wm831x_wdt->timeout = wm831x_wdt_cfgs[i].time; 232 232 233 233 /* Apply any configuration */ 234 - if (pdev->dev.parent->platform_data) { 235 - chip_pdata = pdev->dev.parent->platform_data; 234 + if (chip_pdata) 236 235 pdata = chip_pdata->watchdog; 237 - } else { 236 + else 238 237 pdata = NULL; 239 - } 240 238 241 239 if (pdata) { 242 240 reg &= ~(WM831X_WDOG_SECACT_MASK | WM831X_WDOG_PRIMACT_MASK |