hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jingoo Han 2013-07-30 19:58:51 +09:00 committed by Wim Van Sebroeck
parent 813296a1a2
commit bc8fdfbe75
7 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/watchdog/iTCO_wdt.c
View File

@ -394,7 +394,7 @@ static int iTCO_wdt_probe(struct platform_device *dev)
{ {
int ret = -ENODEV; int ret = -ENODEV;
unsigned long val32; 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) if (!ich_info)
goto out; goto out;

2
drivers/watchdog/mv64x60_wdt.c
View File

@ -255,7 +255,7 @@ static struct miscdevice mv64x60_wdt_miscdev = {
static int mv64x60_wdt_probe(struct platform_device *dev) 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; struct resource *r;
int timeout = 10; int timeout = 10;

2
drivers/watchdog/omap_wdt.c
View File

@ -205,7 +205,7 @@ static const struct watchdog_ops omap_wdt_ops = {
static int omap_wdt_probe(struct platform_device *pdev) 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 watchdog_device *omap_wdt;
struct resource *res, *mem; struct resource *res, *mem;
struct omap_wdt_dev *wdev; struct omap_wdt_dev *wdev;

2
drivers/watchdog/rdc321x_wdt.c
View File

@ -231,7 +231,7 @@ static int rdc321x_wdt_probe(struct platform_device *pdev)
struct resource *r; struct resource *r;
struct rdc321x_wdt_pdata *pdata; struct rdc321x_wdt_pdata *pdata;
pdata = pdev->dev.platform_data; pdata = dev_get_platdata(&pdev->dev);
if (!pdata) { if (!pdata) {
dev_err(&pdev->dev, "no platform data supplied\n"); dev_err(&pdev->dev, "no platform data supplied\n");
return -ENODEV; return -ENODEV;

4
drivers/watchdog/stmp3xxx_rtc_wdt.c
View File

@ -30,7 +30,7 @@ MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat period in seconds from 1 to "
static int wdt_start(struct watchdog_device *wdd) static int wdt_start(struct watchdog_device *wdd)
{ {
struct device *dev = watchdog_get_drvdata(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); pdata->wdt_set_timeout(dev->parent, wdd->timeout * WDOG_TICK_RATE);
return 0; return 0;
@ -39,7 +39,7 @@ static int wdt_start(struct watchdog_device *wdd)
static int wdt_stop(struct watchdog_device *wdd) static int wdt_stop(struct watchdog_device *wdd)
{ {
struct device *dev = watchdog_get_drvdata(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); pdata->wdt_set_timeout(dev->parent, 0);
return 0; return 0;

2
drivers/watchdog/ux500_wdt.c
View File

@ -88,7 +88,7 @@ static struct watchdog_device ux500_wdt = {
static int ux500_wdt_probe(struct platform_device *pdev) static int ux500_wdt_probe(struct platform_device *pdev)
{ {
int ret; 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) {
if (pdata->timeout > 0) if (pdata->timeout > 0)

8
drivers/watchdog/wm831x_wdt.c
View File

@ -184,7 +184,7 @@ static const struct watchdog_ops wm831x_wdt_ops = {
static int wm831x_wdt_probe(struct platform_device *pdev) static int wm831x_wdt_probe(struct platform_device *pdev)
{ {
struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent); 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_watchdog_pdata *pdata;
struct wm831x_wdt_drvdata *driver_data; struct wm831x_wdt_drvdata *driver_data;
struct watchdog_device *wm831x_wdt; 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; wm831x_wdt->timeout = wm831x_wdt_cfgs[i].time;
/* Apply any configuration */ /* Apply any configuration */
if (pdev->dev.parent->platform_data) { if (chip_pdata)
chip_pdata = pdev->dev.parent->platform_data;
pdata = chip_pdata->watchdog; pdata = chip_pdata->watchdog;
} else { else
pdata = NULL; pdata = NULL;
}
if (pdata) { if (pdata) {
reg &= ~(WM831X_WDOG_SECACT_MASK | WM831X_WDOG_PRIMACT_MASK | reg &= ~(WM831X_WDOG_SECACT_MASK | WM831X_WDOG_PRIMACT_MASK |