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

usb: renesas_usbhs: convert to devm_xxx()

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Kuninori Morimoto and committed by
Greg Kroah-Hartman
58efc77c 1cd572fc

+4 -11
+4 -11
drivers/usb/renesas_usbhs/common.c
··· 432 432 } 433 433 434 434 /* usb private data */ 435 - priv = kzalloc(sizeof(*priv), GFP_KERNEL); 435 + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); 436 436 if (!priv) { 437 437 dev_err(&pdev->dev, "Could not allocate priv\n"); 438 438 return -ENOMEM; 439 439 } 440 440 441 - priv->base = ioremap_nocache(res->start, resource_size(res)); 441 + priv->base = devm_request_and_ioremap(&pdev->dev, res); 442 442 if (!priv->base) { 443 443 dev_err(&pdev->dev, "ioremap error.\n"); 444 - ret = -ENOMEM; 445 - goto probe_end_kfree; 444 + return -ENOMEM; 446 445 } 447 446 448 447 /* ··· 484 485 /* call pipe and module init */ 485 486 ret = usbhs_pipe_probe(priv); 486 487 if (ret < 0) 487 - goto probe_end_iounmap; 488 + return ret; 488 489 489 490 ret = usbhs_fifo_probe(priv); 490 491 if (ret < 0) ··· 545 546 usbhs_fifo_remove(priv); 546 547 probe_end_pipe_exit: 547 548 usbhs_pipe_remove(priv); 548 - probe_end_iounmap: 549 - iounmap(priv->base); 550 - probe_end_kfree: 551 - kfree(priv); 552 549 553 550 dev_info(&pdev->dev, "probe failed\n"); 554 551 ··· 571 576 usbhs_mod_remove(priv); 572 577 usbhs_fifo_remove(priv); 573 578 usbhs_pipe_remove(priv); 574 - iounmap(priv->base); 575 - kfree(priv); 576 579 577 580 return 0; 578 581 }