Re: [PATCH v2 2/5] media: davinci: vpif: Convert to devm_* api
Hi Sergei, On Sunday 26 May 2013 18:15:19 Sergei Shtylyov wrote: On 26-05-2013 4:49, Laurent Pinchart wrote: From: Lad, Prabhakar prabhakar.cse...@gmail.com Use devm_ioremap_resource instead of reques_mem_region()/ioremap(). This ensures more consistent error values and simplifies error paths. Signed-off-by: Lad, Prabhakar prabhakar.cse...@gmail.com --- drivers/media/platform/davinci/vpif.c | 27 --- 1 files changed, 4 insertions(+), 23 deletions(-) diff --git a/drivers/media/platform/davinci/vpif.c b/drivers/media/platform/davinci/vpif.c index 761c825..164c1b7 100644 --- a/drivers/media/platform/davinci/vpif.c +++ b/drivers/media/platform/davinci/vpif.c [...] @@ -421,23 +419,12 @@ EXPORT_SYMBOL(vpif_channel_getfid); static int vpif_probe(struct platform_device *pdev) { - int status = 0; + static struct resource *res; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) - return -ENOENT; - - res_len = resource_size(res); - - res = request_mem_region(res-start, res_len, res-name); - if (!res) - return -EBUSY; - - vpif_base = ioremap(res-start, res_len); - if (!vpif_base) { - status = -EBUSY; - goto fail; - } + vpif_base = devm_ioremap_resource(pdev-dev, res); + if (IS_ERR(vpif_base)) + return PTR_ERR(vpif_base); You're loosing the request_mem_region(). He's not losing anything, first look at how devm_ioremp_resource() is defined. My bad. I'm not sure where I got that idea from. Thanks for pointing out the mistake. You should use devm_request_and_ioremap() Already deprecated by now. function instead of devm_ioremap_resource(). With that change, Acked-by: Laurent Pinchart laurent.pinch...@ideasonboard.com -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 2/5] media: davinci: vpif: Convert to devm_* api
Hello. On 26-05-2013 4:49, Laurent Pinchart wrote: From: Lad, Prabhakar prabhakar.cse...@gmail.com Use devm_ioremap_resource instead of reques_mem_region()/ioremap(). This ensures more consistent error values and simplifies error paths. Signed-off-by: Lad, Prabhakar prabhakar.cse...@gmail.com --- drivers/media/platform/davinci/vpif.c | 27 --- 1 files changed, 4 insertions(+), 23 deletions(-) diff --git a/drivers/media/platform/davinci/vpif.c b/drivers/media/platform/davinci/vpif.c index 761c825..164c1b7 100644 --- a/drivers/media/platform/davinci/vpif.c +++ b/drivers/media/platform/davinci/vpif.c [...] @@ -421,23 +419,12 @@ EXPORT_SYMBOL(vpif_channel_getfid); static int vpif_probe(struct platform_device *pdev) { - int status = 0; + static struct resource *res; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) - return -ENOENT; - - res_len = resource_size(res); - - res = request_mem_region(res-start, res_len, res-name); - if (!res) - return -EBUSY; - - vpif_base = ioremap(res-start, res_len); - if (!vpif_base) { - status = -EBUSY; - goto fail; - } + vpif_base = devm_ioremap_resource(pdev-dev, res); + if (IS_ERR(vpif_base)) + return PTR_ERR(vpif_base); You're loosing the request_mem_region(). He's not losing anything, first look at how devm_ioremp_resource() is defined. You should use devm_request_and_ioremap() Already deprecated by now. function instead of devm_ioremap_resource(). With that change, Acked-by: Laurent Pinchart laurent.pinch...@ideasonboard.com WBR, Sergei -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 2/5] media: davinci: vpif: Convert to devm_* api
From: Lad, Prabhakar prabhakar.cse...@gmail.com Use devm_ioremap_resource instead of reques_mem_region()/ioremap(). This ensures more consistent error values and simplifies error paths. Signed-off-by: Lad, Prabhakar prabhakar.cse...@gmail.com --- drivers/media/platform/davinci/vpif.c | 27 --- 1 files changed, 4 insertions(+), 23 deletions(-) diff --git a/drivers/media/platform/davinci/vpif.c b/drivers/media/platform/davinci/vpif.c index 761c825..164c1b7 100644 --- a/drivers/media/platform/davinci/vpif.c +++ b/drivers/media/platform/davinci/vpif.c @@ -37,8 +37,6 @@ MODULE_LICENSE(GPL); #define VPIF_CH2_MAX_MODES (15) #define VPIF_CH3_MAX_MODES (02) -static resource_size_t res_len; -static struct resource *res; spinlock_t vpif_lock; void __iomem *vpif_base; @@ -421,23 +419,12 @@ EXPORT_SYMBOL(vpif_channel_getfid); static int vpif_probe(struct platform_device *pdev) { - int status = 0; + static struct resource *res; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) - return -ENOENT; - - res_len = resource_size(res); - - res = request_mem_region(res-start, res_len, res-name); - if (!res) - return -EBUSY; - - vpif_base = ioremap(res-start, res_len); - if (!vpif_base) { - status = -EBUSY; - goto fail; - } + vpif_base = devm_ioremap_resource(pdev-dev, res); + if (IS_ERR(vpif_base)) + return PTR_ERR(vpif_base); pm_runtime_enable(pdev-dev); pm_runtime_get(pdev-dev); @@ -445,17 +432,11 @@ static int vpif_probe(struct platform_device *pdev) spin_lock_init(vpif_lock); dev_info(pdev-dev, vpif probe success\n); return 0; - -fail: - release_mem_region(res-start, res_len); - return status; } static int vpif_remove(struct platform_device *pdev) { pm_runtime_disable(pdev-dev); - iounmap(vpif_base); - release_mem_region(res-start, res_len); return 0; } -- 1.7.0.4 -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 2/5] media: davinci: vpif: Convert to devm_* api
Hi Prabhakar, Thank you for the patch. On Saturday 25 May 2013 22:06:33 Prabhakar Lad wrote: From: Lad, Prabhakar prabhakar.cse...@gmail.com Use devm_ioremap_resource instead of reques_mem_region()/ioremap(). This ensures more consistent error values and simplifies error paths. Signed-off-by: Lad, Prabhakar prabhakar.cse...@gmail.com --- drivers/media/platform/davinci/vpif.c | 27 --- 1 files changed, 4 insertions(+), 23 deletions(-) diff --git a/drivers/media/platform/davinci/vpif.c b/drivers/media/platform/davinci/vpif.c index 761c825..164c1b7 100644 --- a/drivers/media/platform/davinci/vpif.c +++ b/drivers/media/platform/davinci/vpif.c @@ -37,8 +37,6 @@ MODULE_LICENSE(GPL); #define VPIF_CH2_MAX_MODES (15) #define VPIF_CH3_MAX_MODES (02) -static resource_size_t res_len; -static struct resource *res; spinlock_t vpif_lock; void __iomem *vpif_base; @@ -421,23 +419,12 @@ EXPORT_SYMBOL(vpif_channel_getfid); static int vpif_probe(struct platform_device *pdev) { - int status = 0; + static struct resource *res; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) - return -ENOENT; - - res_len = resource_size(res); - - res = request_mem_region(res-start, res_len, res-name); - if (!res) - return -EBUSY; - - vpif_base = ioremap(res-start, res_len); - if (!vpif_base) { - status = -EBUSY; - goto fail; - } + vpif_base = devm_ioremap_resource(pdev-dev, res); + if (IS_ERR(vpif_base)) + return PTR_ERR(vpif_base); You're loosing the request_mem_region(). You should use devm_request_and_ioremap() function instead of devm_ioremap_resource(). With that change, Acked-by: Laurent Pinchart laurent.pinch...@ideasonboard.com pm_runtime_enable(pdev-dev); pm_runtime_get(pdev-dev); @@ -445,17 +432,11 @@ static int vpif_probe(struct platform_device *pdev) spin_lock_init(vpif_lock); dev_info(pdev-dev, vpif probe success\n); return 0; - -fail: - release_mem_region(res-start, res_len); - return status; } static int vpif_remove(struct platform_device *pdev) { pm_runtime_disable(pdev-dev); - iounmap(vpif_base); - release_mem_region(res-start, res_len); return 0; } -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html