@@ -449,21 +449,20 @@ static int wpcm_fiu_probe(struct platform_device *pdev)
449
449
fiu -> dev = dev ;
450
450
451
451
fiu -> regs = devm_platform_ioremap_resource_byname (pdev , "control" );
452
- if (IS_ERR (fiu -> regs )) {
453
- dev_err (dev , "Failed to map registers\n" );
454
- return PTR_ERR (fiu -> regs );
455
- }
452
+ if (IS_ERR (fiu -> regs ))
453
+ return dev_err_probe (dev , PTR_ERR (fiu -> regs ),
454
+ "Failed to map registers\n" );
456
455
457
456
fiu -> clk = devm_clk_get_enabled (dev , NULL );
458
457
if (IS_ERR (fiu -> clk ))
459
458
return PTR_ERR (fiu -> clk );
460
459
461
- fiu -> memory = devm_platform_ioremap_resource_byname (pdev , "memory" );
460
+ res = platform_get_resource_byname (pdev , IORESOURCE_MEM , "memory" );
461
+ fiu -> memory = devm_ioremap_resource (dev , res );
462
462
fiu -> memory_size = min_t (size_t , resource_size (res ), MAX_MEMORY_SIZE_TOTAL );
463
- if (IS_ERR (fiu -> memory )) {
464
- dev_err (dev , "Failed to map flash memory window\n" );
465
- return PTR_ERR (fiu -> memory );
466
- }
463
+ if (IS_ERR (fiu -> memory ))
464
+ return dev_err_probe (dev , PTR_ERR (fiu -> memory ),
465
+ "Failed to map flash memory window\n" );
467
466
468
467
fiu -> shm_regmap = syscon_regmap_lookup_by_phandle_optional (dev -> of_node , "nuvoton,shm" );
469
468
0 commit comments