2014-06-20 12:00:18

by Lad, Prabhakar

[permalink] [raw]

Subject: [PATCH] can: c_can: convert to use devm * api

---

From: "Lad, Prabhakar" <[email protected]>

this patch uses devm_* APIs as they are device managed
and make code simpler.

Signed-off-by: Lad, Prabhakar <[email protected]>
---
Note: This patch is compile tested only.

drivers/net/can/c_can/c_can_platform.c | 41 ++++++++--------------------------
1 file changed, 9 insertions(+), 32 deletions(-)

diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c
index 1df0b32..e0dcbcf 100644
--- a/drivers/net/can/c_can/c_can_platform.c
+++ b/drivers/net/can/c_can/c_can_platform.c
@@ -157,40 +157,31 @@ static int c_can_plat_probe(struct platform_device *pdev)
}

/* get the appropriate clk */
- clk = clk_get(&pdev->dev, NULL);
+ clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(clk)) {
- dev_err(&pdev->dev, "no clock defined\n");
- ret = -ENODEV;
+ ret = PTR_ERR(clk);
goto exit;
}

/* get the platform data */
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
irq = platform_get_irq(pdev, 0);
- if (!mem || irq <= 0) {
- ret = -ENODEV;
- goto exit_free_clk;
- }
-
- if (!request_mem_region(mem->start, resource_size(mem),
- KBUILD_MODNAME)) {
- dev_err(&pdev->dev, "resource unavailable\n");
+ if (irq <= 0) {
ret = -ENODEV;
- goto exit_free_clk;
+ goto exit;
}

- addr = ioremap(mem->start, resource_size(mem));
- if (!addr) {
- dev_err(&pdev->dev, "failed to map can port\n");
- ret = -ENOMEM;
- goto exit_release_mem;
+ addr = devm_ioremap_resource(&pdev->dev, mem);
+ if (IS_ERR(addr)) {
+ ret = PTR_ERR(addr);
+ goto exit;
}

/* allocate the c_can device */
dev = alloc_c_can_dev();
if (!dev) {
ret = -ENOMEM;
- goto exit_iounmap;
+ goto exit;
}

priv = netdev_priv(dev);
@@ -255,12 +246,6 @@ static int c_can_plat_probe(struct platform_device *pdev)

exit_free_device:
free_c_can_dev(dev);
-exit_iounmap:
- iounmap(addr);
-exit_release_mem:
- release_mem_region(mem->start, resource_size(mem));
-exit_free_clk:
- clk_put(clk);
exit:
dev_err(&pdev->dev, "probe failed\n");

@@ -270,18 +255,10 @@ exit:
static int c_can_plat_remove(struct platform_device *pdev)
{
struct net_device *dev = platform_get_drvdata(pdev);
- struct c_can_priv *priv = netdev_priv(dev);
- struct resource *mem;

unregister_c_can_dev(dev);

free_c_can_dev(dev);
- iounmap(priv->base);
-
- mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- release_mem_region(mem->start, resource_size(mem));
-
- clk_put(priv->priv);

return 0;
}
--
1.9.1

2014-06-22 10:56:44

by Marc Kleine-Budde

[permalink] [raw]

Subject: Re: [PATCH] can: c_can: convert to use devm * api

---

On 06/20/2014 01:59 PM, Lad, Prabhakar wrote:
> From: "Lad, Prabhakar" <[email protected]>
>
> this patch uses devm_* APIs as they are device managed
> and make code simpler.
>
> Signed-off-by: Lad, Prabhakar <[email protected]>

Thanks for the patch. Applied to can-next with minor change (see inline).

> ---
> Note: This patch is compile tested only.
>
> drivers/net/can/c_can/c_can_platform.c | 41 ++++++++--------------------------
> 1 file changed, 9 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c
> index 1df0b32..e0dcbcf 100644
> --- a/drivers/net/can/c_can/c_can_platform.c
> +++ b/drivers/net/can/c_can/c_can_platform.c
> @@ -157,40 +157,31 @@ static int c_can_plat_probe(struct platform_device *pdev)
> }
>
> /* get the appropriate clk */
> - clk = clk_get(&pdev->dev, NULL);
> + clk = devm_clk_get(&pdev->dev, NULL);
> if (IS_ERR(clk)) {
> - dev_err(&pdev->dev, "no clock defined\n");
> - ret = -ENODEV;
> + ret = PTR_ERR(clk);
> goto exit;
> }
>
> /* get the platform data */
> mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> irq = platform_get_irq(pdev, 0);
> - if (!mem || irq <= 0) {
> - ret = -ENODEV;
> - goto exit_free_clk;
> - }
> -
> - if (!request_mem_region(mem->start, resource_size(mem),
> - KBUILD_MODNAME)) {
> - dev_err(&pdev->dev, "resource unavailable\n");
> + if (irq <= 0) {
> ret = -ENODEV;
> - goto exit_free_clk;
> + goto exit;
> }
>
> - addr = ioremap(mem->start, resource_size(mem));
> - if (!addr) {
> - dev_err(&pdev->dev, "failed to map can port\n");
> - ret = -ENOMEM;
> - goto exit_release_mem;

I've moved the mem = platform_get_resource() for slightly better
readability here....

> + addr = devm_ioremap_resource(&pdev->dev, mem);
> + if (IS_ERR(addr)) {
> + ret = PTR_ERR(addr);
> + goto exit;
> }

Thanks,
Marc

--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |

---

Attachments:

signature.asc (242.00 B)
OpenPGP digital signature

2014-06-22 11:54:47

by Lad, Prabhakar

[permalink] [raw]

Subject: Re: [PATCH] can: c_can: convert to use devm * api

---

On Sun, Jun 22, 2014 at 11:56 AM, Marc Kleine-Budde <[email protected]> wrote:
> On 06/20/2014 01:59 PM, Lad, Prabhakar wrote:
>> From: "Lad, Prabhakar" <[email protected]>
>>
>> this patch uses devm_* APIs as they are device managed
>> and make code simpler.
>>
>> Signed-off-by: Lad, Prabhakar <[email protected]>
>
> Thanks for the patch. Applied to can-next with minor change (see inline).
>
>> ---
>> Note: This patch is compile tested only.
>>
>> drivers/net/can/c_can/c_can_platform.c | 41 ++++++++--------------------------
>> 1 file changed, 9 insertions(+), 32 deletions(-)
>>
>> diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c
>> index 1df0b32..e0dcbcf 100644
>> --- a/drivers/net/can/c_can/c_can_platform.c
>> +++ b/drivers/net/can/c_can/c_can_platform.c
>> @@ -157,40 +157,31 @@ static int c_can_plat_probe(struct platform_device *pdev)
>> }
>>
>> /* get the appropriate clk */
>> - clk = clk_get(&pdev->dev, NULL);
>> + clk = devm_clk_get(&pdev->dev, NULL);
>> if (IS_ERR(clk)) {
>> - dev_err(&pdev->dev, "no clock defined\n");
>> - ret = -ENODEV;
>> + ret = PTR_ERR(clk);
>> goto exit;
>> }
>>
>> /* get the platform data */
>> mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>> irq = platform_get_irq(pdev, 0);
>> - if (!mem || irq <= 0) {
>> - ret = -ENODEV;
>> - goto exit_free_clk;
>> - }
>> -
>> - if (!request_mem_region(mem->start, resource_size(mem),
>> - KBUILD_MODNAME)) {
>> - dev_err(&pdev->dev, "resource unavailable\n");
>> + if (irq <= 0) {
>> ret = -ENODEV;
>> - goto exit_free_clk;
>> + goto exit;
>> }
>>
>> - addr = ioremap(mem->start, resource_size(mem));
>> - if (!addr) {
>> - dev_err(&pdev->dev, "failed to map can port\n");
>> - ret = -ENOMEM;
>> - goto exit_release_mem;
>
> I've moved the mem = platform_get_resource() for slightly better
> readability here....
>
Thanks makes sense.

Regards,
--Prabhakar Lad

>> + addr = devm_ioremap_resource(&pdev->dev, mem);
>> + if (IS_ERR(addr)) {
>> + ret = PTR_ERR(addr);
>> + goto exit;
>> }
>
> Thanks,
> Marc
>
> --
> Pengutronix e.K. | Marc Kleine-Budde |
> Industrial Linux Solutions | Phone: +49-231-2826-924 |
> Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
> Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
>