@@ -246,30 +246,31 @@ static const struct regmap_config imx2_wdt_regmap_config = {
246
246
247
247
static int __init imx2_wdt_probe (struct platform_device * pdev )
248
248
{
249
+ struct device * dev = & pdev -> dev ;
249
250
struct imx2_wdt_device * wdev ;
250
251
struct watchdog_device * wdog ;
251
252
void __iomem * base ;
252
253
int ret ;
253
254
u32 val ;
254
255
255
- wdev = devm_kzalloc (& pdev -> dev , sizeof (* wdev ), GFP_KERNEL );
256
+ wdev = devm_kzalloc (dev , sizeof (* wdev ), GFP_KERNEL );
256
257
if (!wdev )
257
258
return - ENOMEM ;
258
259
259
260
base = devm_platform_ioremap_resource (pdev , 0 );
260
261
if (IS_ERR (base ))
261
262
return PTR_ERR (base );
262
263
263
- wdev -> regmap = devm_regmap_init_mmio_clk (& pdev -> dev , NULL , base ,
264
+ wdev -> regmap = devm_regmap_init_mmio_clk (dev , NULL , base ,
264
265
& imx2_wdt_regmap_config );
265
266
if (IS_ERR (wdev -> regmap )) {
266
- dev_err (& pdev -> dev , "regmap init failed\n" );
267
+ dev_err (dev , "regmap init failed\n" );
267
268
return PTR_ERR (wdev -> regmap );
268
269
}
269
270
270
- wdev -> clk = devm_clk_get (& pdev -> dev , NULL );
271
+ wdev -> clk = devm_clk_get (dev , NULL );
271
272
if (IS_ERR (wdev -> clk )) {
272
- dev_err (& pdev -> dev , "can't get Watchdog clock\n" );
273
+ dev_err (dev , "can't get Watchdog clock\n" );
273
274
return PTR_ERR (wdev -> clk );
274
275
}
275
276
@@ -279,12 +280,12 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
279
280
wdog -> min_timeout = 1 ;
280
281
wdog -> timeout = IMX2_WDT_DEFAULT_TIME ;
281
282
wdog -> max_hw_heartbeat_ms = IMX2_WDT_MAX_TIME * 1000 ;
282
- wdog -> parent = & pdev -> dev ;
283
+ wdog -> parent = dev ;
283
284
284
285
ret = platform_get_irq (pdev , 0 );
285
286
if (ret > 0 )
286
- if (!devm_request_irq (& pdev -> dev , ret , imx2_wdt_isr , 0 ,
287
- dev_name (& pdev -> dev ), wdog ))
287
+ if (!devm_request_irq (dev , ret , imx2_wdt_isr , 0 ,
288
+ dev_name (dev ), wdog ))
288
289
wdog -> info = & imx2_wdt_pretimeout_info ;
289
290
290
291
ret = clk_prepare_enable (wdev -> clk );
@@ -294,13 +295,13 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
294
295
regmap_read (wdev -> regmap , IMX2_WDT_WRSR , & val );
295
296
wdog -> bootstatus = val & IMX2_WDT_WRSR_TOUT ? WDIOF_CARDRESET : 0 ;
296
297
297
- wdev -> ext_reset = of_property_read_bool (pdev -> dev . of_node ,
298
+ wdev -> ext_reset = of_property_read_bool (dev -> of_node ,
298
299
"fsl,ext-reset-output" );
299
300
platform_set_drvdata (pdev , wdog );
300
301
watchdog_set_drvdata (wdog , wdev );
301
302
watchdog_set_nowayout (wdog , nowayout );
302
303
watchdog_set_restart_priority (wdog , 128 );
303
- watchdog_init_timeout (wdog , timeout , & pdev -> dev );
304
+ watchdog_init_timeout (wdog , timeout , dev );
304
305
305
306
if (imx2_wdt_is_running (wdev )) {
306
307
imx2_wdt_set_timeout (wdog , wdog -> timeout );
@@ -318,7 +319,7 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
318
319
if (ret )
319
320
goto disable_clk ;
320
321
321
- dev_info (& pdev -> dev , "timeout %d sec (nowayout=%d)\n" ,
322
+ dev_info (dev , "timeout %d sec (nowayout=%d)\n" ,
322
323
wdog -> timeout , nowayout );
323
324
324
325
return 0 ;
0 commit comments