Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc8fdfbe authored by Jingoo Han's avatar Jingoo Han Committed by Wim Van Sebroeck
Browse files

watchdog: use dev_get_platdata() 



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

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 813296a1

drivers/watchdog/iTCO_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;