* [PATCH] can: c_can: convert to use devm * api
@ 2014-06-20 11:59 Lad, Prabhakar
2014-06-22 10:56 ` Marc Kleine-Budde
0 siblings, 1 reply; 3+ messages in thread
From: Lad, Prabhakar @ 2014-06-20 11:59 UTC (permalink / raw)
To: linux-can, netdev, Wolfgang Grandegger, Marc Kleine-Budde
Cc: LKML, Lad, Prabhakar
From: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
this patch uses devm_* APIs as they are device managed
and make code simpler.
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] can: c_can: convert to use devm * api
2014-06-20 11:59 [PATCH] can: c_can: convert to use devm * api Lad, Prabhakar
@ 2014-06-22 10:56 ` Marc Kleine-Budde
2014-06-22 11:54 ` Prabhakar Lad
0 siblings, 1 reply; 3+ messages in thread
From: Marc Kleine-Budde @ 2014-06-22 10:56 UTC (permalink / raw)
To: Lad, Prabhakar, linux-can, netdev, Wolfgang Grandegger; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 2264 bytes --]
On 06/20/2014 01:59 PM, Lad, Prabhakar wrote:
> From: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
>
> this patch uses devm_* APIs as they are device managed
> and make code simpler.
>
> Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
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 |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 242 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] can: c_can: convert to use devm * api
2014-06-22 10:56 ` Marc Kleine-Budde
@ 2014-06-22 11:54 ` Prabhakar Lad
0 siblings, 0 replies; 3+ messages in thread
From: Prabhakar Lad @ 2014-06-22 11:54 UTC (permalink / raw)
To: Marc Kleine-Budde; +Cc: linux-can, netdev, Wolfgang Grandegger, LKML
On Sun, Jun 22, 2014 at 11:56 AM, Marc Kleine-Budde <mkl@pengutronix.de> wrote:
> On 06/20/2014 01:59 PM, Lad, Prabhakar wrote:
>> From: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
>>
>> this patch uses devm_* APIs as they are device managed
>> and make code simpler.
>>
>> Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
>
> 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 |
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-06-22 11:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-20 11:59 [PATCH] can: c_can: convert to use devm * api Lad, Prabhakar
2014-06-22 10:56 ` Marc Kleine-Budde
2014-06-22 11:54 ` Prabhakar Lad
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).