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

misc: sram: use devm_platform_ioremap_resource_wc()

Use the new devm_platform_ioremap_resource_wc() helper instead of
devm_ioremap_wc() combinded with a call to platform_get_resource().
Also use devm_platform_ioremap_resource() where applicable.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20191022084318.22256-6-brgl@bgdev.pl
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Bartosz Golaszewski and committed by
Greg Kroah-Hartman
444b0111 bb6243b4

+8 -20
+8 -20
drivers/misc/sram.c
··· 340 340 static int sram_probe(struct platform_device *pdev) 341 341 { 342 342 struct sram_dev *sram; 343 - struct resource *res; 344 - size_t size; 345 343 int ret; 346 344 int (*init_func)(void); 347 345 ··· 349 351 350 352 sram->dev = &pdev->dev; 351 353 352 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 353 - if (!res) { 354 - dev_err(sram->dev, "found no memory resource\n"); 355 - return -EINVAL; 356 - } 357 - 358 - size = resource_size(res); 359 - 360 - if (!devm_request_mem_region(sram->dev, res->start, size, pdev->name)) { 361 - dev_err(sram->dev, "could not request region for resource\n"); 362 - return -EBUSY; 363 - } 364 - 365 354 if (of_property_read_bool(pdev->dev.of_node, "no-memory-wc")) 366 - sram->virt_base = devm_ioremap(sram->dev, res->start, size); 355 + sram->virt_base = devm_platform_ioremap_resource(pdev, 0); 367 356 else 368 - sram->virt_base = devm_ioremap_wc(sram->dev, res->start, size); 369 - if (!sram->virt_base) 370 - return -ENOMEM; 357 + sram->virt_base = devm_platform_ioremap_resource_wc(pdev, 0); 358 + if (IS_ERR(sram->virt_base)) { 359 + dev_err(&pdev->dev, "could not map SRAM registers\n"); 360 + return PTR_ERR(sram->virt_base); 361 + } 371 362 372 363 sram->pool = devm_gen_pool_create(sram->dev, ilog2(SRAM_GRANULARITY), 373 364 NUMA_NO_NODE, NULL); ··· 369 382 else 370 383 clk_prepare_enable(sram->clk); 371 384 372 - ret = sram_reserve_regions(sram, res); 385 + ret = sram_reserve_regions(sram, 386 + platform_get_resource(pdev, IORESOURCE_MEM, 0)); 373 387 if (ret) 374 388 goto err_disable_clk; 375 389