Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 58efc77c86af5cb81d7d7ea0c3c3e675e7d121dc

Authored by Kuninori Morimoto
Committed by Greg Kroah-Hartman
1 parent 1cd572fc0c
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 1 changed file with 4 additions and 11 deletions Side-by-side Diff

drivers/usb/renesas_usbhs/common.c
Diff comments   View file @ 58efc77
... ... @@ -432,17 +432,16 @@
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 /*
... ... @@ -485,7 +484,7 @@
485 484 /* call pipe and module init */
486 485 ret = usbhs_pipe_probe(priv);
487 486 if (ret < 0)
488   - goto probe_end_iounmap;
  487 + return ret;
489 488  
490 489 ret = usbhs_fifo_probe(priv);
491 490 if (ret < 0)
... ... @@ -546,10 +545,6 @@
546 545 usbhs_fifo_remove(priv);
547 546 probe_end_pipe_exit:
548 547 usbhs_pipe_remove(priv);
549   -probe_end_iounmap:
550   - iounmap(priv->base);
551   -probe_end_kfree:
552   - kfree(priv);
553 548  
554 549 dev_info(&pdev->dev, "probe failed\n");
555 550  
... ... @@ -576,8 +571,6 @@
576 571 usbhs_mod_remove(priv);
577 572 usbhs_fifo_remove(priv);
578 573 usbhs_pipe_remove(priv);
579   - iounmap(priv->base);
580   - kfree(priv);
581 574  
582 575 return 0;
583 576 }