* [PATCH v3 1/9] media: davinci: vpif: remove unwanted header mach/hardware.h and sort the includes alphabetically
2013-05-26 12:00 [PATCH v3 0/9] media: davinci: vpif trivial cleanup Prabhakar Lad
@ 2013-05-26 12:00 ` Prabhakar Lad
2013-05-26 12:00 ` [PATCH v3 2/9] media: davinci: vpif: Convert to devm_* api Prabhakar Lad
` (7 subsequent siblings)
8 siblings, 0 replies; 19+ messages in thread
From: Prabhakar Lad @ 2013-05-26 12:00 UTC (permalink / raw)
To: Hans Verkuil, Mauro Carvalho Chehab, LMML, Laurent Pinchart
Cc: DLOS, LKML, Lad, Prabhakar
From: Lad, Prabhakar <prabhakar.csengg@gmail.com>
This patch removes unwanted header include of mach/hardware.h
and along side sorts the header inclusion alphabetically.
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/media/platform/davinci/vpif.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/media/platform/davinci/vpif.c b/drivers/media/platform/davinci/vpif.c
index ea82a8b..761c825 100644
--- a/drivers/media/platform/davinci/vpif.c
+++ b/drivers/media/platform/davinci/vpif.c
@@ -17,18 +17,16 @@
* GNU General Public License for more details.
*/
+#include <linux/err.h>
#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/platform_device.h>
-#include <linux/spinlock.h>
-#include <linux/kernel.h>
-#include <linux/io.h>
-#include <linux/err.h>
#include <linux/pm_runtime.h>
+#include <linux/spinlock.h>
#include <linux/v4l2-dv-timings.h>
-#include <mach/hardware.h>
-
#include "vpif.h"
MODULE_DESCRIPTION("TI DaVinci Video Port Interface driver");
--
1.7.0.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v3 2/9] media: davinci: vpif: Convert to devm_* api
2013-05-26 12:00 [PATCH v3 0/9] media: davinci: vpif trivial cleanup Prabhakar Lad
2013-05-26 12:00 ` [PATCH v3 1/9] media: davinci: vpif: remove unwanted header mach/hardware.h and sort the includes alphabetically Prabhakar Lad
@ 2013-05-26 12:00 ` Prabhakar Lad
2013-05-26 14:37 ` Sergei Shtylyov
2013-05-26 12:00 ` [PATCH v3 3/9] media: davinci: vpif: remove unnecessary braces around defines Prabhakar Lad
` (6 subsequent siblings)
8 siblings, 1 reply; 19+ messages in thread
From: Prabhakar Lad @ 2013-05-26 12:00 UTC (permalink / raw)
To: Hans Verkuil, Mauro Carvalho Chehab, LMML, Laurent Pinchart
Cc: DLOS, LKML, Lad, Prabhakar
From: Lad, Prabhakar <prabhakar.csengg@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.csengg@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.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..f857d8f 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_request_and_ioremap(&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
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH v3 2/9] media: davinci: vpif: Convert to devm_* api
2013-05-26 12:00 ` [PATCH v3 2/9] media: davinci: vpif: Convert to devm_* api Prabhakar Lad
@ 2013-05-26 14:37 ` Sergei Shtylyov
0 siblings, 0 replies; 19+ messages in thread
From: Sergei Shtylyov @ 2013-05-26 14:37 UTC (permalink / raw)
To: Prabhakar Lad
Cc: Hans Verkuil, Mauro Carvalho Chehab, LMML, Laurent Pinchart, DLOS,
LKML
Hello.
On 26-05-2013 16:00, Prabhakar Lad wrote:
> From: Lad, Prabhakar <prabhakar.csengg@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.csengg@gmail.com>
> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.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..f857d8f 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);
[...]
> + vpif_base = devm_request_and_ioremap(&pdev->dev, res);
No, don't use this deprecated funtion please. Undo to
devm_ioremap_resource().
> + if (IS_ERR(vpif_base))
NAK, devm_request_and_ioremap() doesn't rethrn error cpdes, only
NULL. BTW, it's implemented via a call to devm_ioremap_resource() now.
Is it so hard to look at the code that you've calling?
> + return PTR_ERR(vpif_base);
WBR, Sergei
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v3 3/9] media: davinci: vpif: remove unnecessary braces around defines
2013-05-26 12:00 [PATCH v3 0/9] media: davinci: vpif trivial cleanup Prabhakar Lad
2013-05-26 12:00 ` [PATCH v3 1/9] media: davinci: vpif: remove unwanted header mach/hardware.h and sort the includes alphabetically Prabhakar Lad
2013-05-26 12:00 ` [PATCH v3 2/9] media: davinci: vpif: Convert to devm_* api Prabhakar Lad
@ 2013-05-26 12:00 ` Prabhakar Lad
2013-05-26 12:00 ` [PATCH v3 4/9] media: davinci: vpif_capture: move the freeing of irq and global variables to remove() Prabhakar Lad
` (5 subsequent siblings)
8 siblings, 0 replies; 19+ messages in thread
From: Prabhakar Lad @ 2013-05-26 12:00 UTC (permalink / raw)
To: Hans Verkuil, Mauro Carvalho Chehab, LMML, Laurent Pinchart
Cc: DLOS, LKML, Lad, Prabhakar
From: Lad, Prabhakar <prabhakar.csengg@gmail.com>
This patch removes unnecessary braces around defines.
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/media/platform/davinci/vpif.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/media/platform/davinci/vpif.c b/drivers/media/platform/davinci/vpif.c
index f857d8f..77763f1 100644
--- a/drivers/media/platform/davinci/vpif.c
+++ b/drivers/media/platform/davinci/vpif.c
@@ -32,10 +32,10 @@
MODULE_DESCRIPTION("TI DaVinci Video Port Interface driver");
MODULE_LICENSE("GPL");
-#define VPIF_CH0_MAX_MODES (22)
-#define VPIF_CH1_MAX_MODES (02)
-#define VPIF_CH2_MAX_MODES (15)
-#define VPIF_CH3_MAX_MODES (02)
+#define VPIF_CH0_MAX_MODES 22
+#define VPIF_CH1_MAX_MODES 2
+#define VPIF_CH2_MAX_MODES 15
+#define VPIF_CH3_MAX_MODES 2
spinlock_t vpif_lock;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v3 4/9] media: davinci: vpif_capture: move the freeing of irq and global variables to remove()
2013-05-26 12:00 [PATCH v3 0/9] media: davinci: vpif trivial cleanup Prabhakar Lad
` (2 preceding siblings ...)
2013-05-26 12:00 ` [PATCH v3 3/9] media: davinci: vpif: remove unnecessary braces around defines Prabhakar Lad
@ 2013-05-26 12:00 ` Prabhakar Lad
2013-05-26 14:47 ` Sergei Shtylyov
2013-05-29 2:32 ` Laurent Pinchart
2013-05-26 12:00 ` [PATCH v3 5/9] media: davinci: vpif_capture: use module_platform_driver() Prabhakar Lad
` (4 subsequent siblings)
8 siblings, 2 replies; 19+ messages in thread
From: Prabhakar Lad @ 2013-05-26 12:00 UTC (permalink / raw)
To: Hans Verkuil, Mauro Carvalho Chehab, LMML, Laurent Pinchart
Cc: DLOS, LKML, Lad, Prabhakar
From: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Ideally the freeing of irq's and the global variables needs to be
done in the remove() rather than module_exit(), this patch moves
the freeing up of irq's and freeing the memory allocated to channel
objects to remove() callback of struct platform_driver.
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
---
drivers/media/platform/davinci/vpif_capture.c | 31 ++++++++++--------------
1 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index caaf4fe..f8b7304 100644
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -2225,17 +2225,29 @@ vpif_int_err:
*/
static int vpif_remove(struct platform_device *device)
{
- int i;
+ struct platform_device *pdev;
struct channel_obj *ch;
+ struct resource *res;
+ int irq_num, i = 0;
+
+ pdev = container_of(vpif_dev, struct platform_device, dev);
+ while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, i))) {
+ for (irq_num = res->start; irq_num <= res->end; irq_num++)
+ free_irq(irq_num,
+ (void *)(&vpif_obj.dev[i]->channel_id));
+ i++;
+ }
v4l2_device_unregister(&vpif_obj.v4l2_dev);
+ kfree(vpif_obj.sd);
/* un-register device */
for (i = 0; i < VPIF_CAPTURE_MAX_DEVICES; i++) {
/* Get the pointer to the channel object */
ch = vpif_obj.dev[i];
/* Unregister video device */
video_unregister_device(ch->video_dev);
+ kfree(vpif_obj.dev[i]);
}
return 0;
}
@@ -2347,24 +2359,7 @@ static __init int vpif_init(void)
*/
static void vpif_cleanup(void)
{
- struct platform_device *pdev;
- struct resource *res;
- int irq_num;
- int i = 0;
-
- pdev = container_of(vpif_dev, struct platform_device, dev);
- while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, i))) {
- for (irq_num = res->start; irq_num <= res->end; irq_num++)
- free_irq(irq_num,
- (void *)(&vpif_obj.dev[i]->channel_id));
- i++;
- }
-
platform_driver_unregister(&vpif_driver);
-
- kfree(vpif_obj.sd);
- for (i = 0; i < VPIF_CAPTURE_MAX_DEVICES; i++)
- kfree(vpif_obj.dev[i]);
}
/* Function for module initialization and cleanup */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH v3 4/9] media: davinci: vpif_capture: move the freeing of irq and global variables to remove()
2013-05-26 12:00 ` [PATCH v3 4/9] media: davinci: vpif_capture: move the freeing of irq and global variables to remove() Prabhakar Lad
@ 2013-05-26 14:47 ` Sergei Shtylyov
2013-05-29 2:32 ` Laurent Pinchart
1 sibling, 0 replies; 19+ messages in thread
From: Sergei Shtylyov @ 2013-05-26 14:47 UTC (permalink / raw)
To: Prabhakar Lad
Cc: Hans Verkuil, Mauro Carvalho Chehab, LMML, Laurent Pinchart, DLOS,
LKML
Hello.
On 26-05-2013 16:00, Prabhakar Lad wrote:
> From: Lad, Prabhakar <prabhakar.csengg@gmail.com>
> Ideally the freeing of irq's and the global variables needs to be
> done in the remove() rather than module_exit(), this patch moves
> the freeing up of irq's and freeing the memory allocated to channel
> objects to remove() callback of struct platform_driver.
> Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
> ---
> drivers/media/platform/davinci/vpif_capture.c | 31 ++++++++++--------------
> 1 files changed, 13 insertions(+), 18 deletions(-)
> diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
> index caaf4fe..f8b7304 100644
> --- a/drivers/media/platform/davinci/vpif_capture.c
> +++ b/drivers/media/platform/davinci/vpif_capture.c
> @@ -2225,17 +2225,29 @@ vpif_int_err:
> */
> static int vpif_remove(struct platform_device *device)
> {
> - int i;
> + struct platform_device *pdev;
> struct channel_obj *ch;
> + struct resource *res;
> + int irq_num, i = 0;
> +
> + pdev = container_of(vpif_dev, struct platform_device, dev);
Why you need this if you should be already called with the correct
platform device?
WBR, Sergei
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH v3 4/9] media: davinci: vpif_capture: move the freeing of irq and global variables to remove()
2013-05-26 12:00 ` [PATCH v3 4/9] media: davinci: vpif_capture: move the freeing of irq and global variables to remove() Prabhakar Lad
2013-05-26 14:47 ` Sergei Shtylyov
@ 2013-05-29 2:32 ` Laurent Pinchart
2013-05-29 4:14 ` Prabhakar Lad
1 sibling, 1 reply; 19+ messages in thread
From: Laurent Pinchart @ 2013-05-29 2:32 UTC (permalink / raw)
To: Prabhakar Lad; +Cc: Hans Verkuil, Mauro Carvalho Chehab, LMML, DLOS, LKML
Hi Prabhakar,
Thanks for the patch.
On Sunday 26 May 2013 17:30:07 Prabhakar Lad wrote:
> From: Lad, Prabhakar <prabhakar.csengg@gmail.com>
>
> Ideally the freeing of irq's and the global variables needs to be
> done in the remove() rather than module_exit(), this patch moves
> the freeing up of irq's and freeing the memory allocated to channel
> objects to remove() callback of struct platform_driver.
>
> Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
> ---
> drivers/media/platform/davinci/vpif_capture.c | 31 ++++++++++------------
> 1 files changed, 13 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/media/platform/davinci/vpif_capture.c
> b/drivers/media/platform/davinci/vpif_capture.c index caaf4fe..f8b7304
> 100644
> --- a/drivers/media/platform/davinci/vpif_capture.c
> +++ b/drivers/media/platform/davinci/vpif_capture.c
> @@ -2225,17 +2225,29 @@ vpif_int_err:
> */
> static int vpif_remove(struct platform_device *device)
> {
> - int i;
> + struct platform_device *pdev;
> struct channel_obj *ch;
> + struct resource *res;
> + int irq_num, i = 0;
> +
> + pdev = container_of(vpif_dev, struct platform_device, dev);
As Sergei mentioned, the platform device is already passed to the function as
an argument.
> + while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, i))) {
> + for (irq_num = res->start; irq_num <= res->end; irq_num++)
> + free_irq(irq_num,
> + (void *)(&vpif_obj.dev[i]->channel_id));
A quick look at board code shows that each IRQ resource contains a single IRQ.
The second loop could thus be removed. You could also add another patch to
perform similar cleanup for the probe code.
> + i++;
> + }
>
> v4l2_device_unregister(&vpif_obj.v4l2_dev);
>
> + kfree(vpif_obj.sd);
> /* un-register device */
> for (i = 0; i < VPIF_CAPTURE_MAX_DEVICES; i++) {
> /* Get the pointer to the channel object */
> ch = vpif_obj.dev[i];
> /* Unregister video device */
> video_unregister_device(ch->video_dev);
> + kfree(vpif_obj.dev[i]);
> }
> return 0;
> }
> @@ -2347,24 +2359,7 @@ static __init int vpif_init(void)
> */
> static void vpif_cleanup(void)
> {
> - struct platform_device *pdev;
> - struct resource *res;
> - int irq_num;
> - int i = 0;
> -
> - pdev = container_of(vpif_dev, struct platform_device, dev);
> - while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, i))) {
> - for (irq_num = res->start; irq_num <= res->end; irq_num++)
> - free_irq(irq_num,
> - (void *)(&vpif_obj.dev[i]->channel_id));
> - i++;
> - }
> -
> platform_driver_unregister(&vpif_driver);
> -
> - kfree(vpif_obj.sd);
> - for (i = 0; i < VPIF_CAPTURE_MAX_DEVICES; i++)
> - kfree(vpif_obj.dev[i]);
> }
>
> /* Function for module initialization and cleanup */
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH v3 4/9] media: davinci: vpif_capture: move the freeing of irq and global variables to remove()
2013-05-29 2:32 ` Laurent Pinchart
@ 2013-05-29 4:14 ` Prabhakar Lad
0 siblings, 0 replies; 19+ messages in thread
From: Prabhakar Lad @ 2013-05-29 4:14 UTC (permalink / raw)
To: Laurent Pinchart; +Cc: Hans Verkuil, Mauro Carvalho Chehab, LMML, DLOS, LKML
Hi Laurent,
Thanks for the review.
On Wed, May 29, 2013 at 8:02 AM, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> Hi Prabhakar,
>
> Thanks for the patch.
>
> On Sunday 26 May 2013 17:30:07 Prabhakar Lad wrote:
>> From: Lad, Prabhakar <prabhakar.csengg@gmail.com>
>>
>> Ideally the freeing of irq's and the global variables needs to be
>> done in the remove() rather than module_exit(), this patch moves
>> the freeing up of irq's and freeing the memory allocated to channel
>> objects to remove() callback of struct platform_driver.
>>
>> Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
>> ---
>> drivers/media/platform/davinci/vpif_capture.c | 31 ++++++++++------------
>> 1 files changed, 13 insertions(+), 18 deletions(-)
>>
>> diff --git a/drivers/media/platform/davinci/vpif_capture.c
>> b/drivers/media/platform/davinci/vpif_capture.c index caaf4fe..f8b7304
>> 100644
>> --- a/drivers/media/platform/davinci/vpif_capture.c
>> +++ b/drivers/media/platform/davinci/vpif_capture.c
>> @@ -2225,17 +2225,29 @@ vpif_int_err:
>> */
>> static int vpif_remove(struct platform_device *device)
>> {
>> - int i;
>> + struct platform_device *pdev;
>> struct channel_obj *ch;
>> + struct resource *res;
>> + int irq_num, i = 0;
>> +
>> + pdev = container_of(vpif_dev, struct platform_device, dev);
>
> As Sergei mentioned, the platform device is already passed to the function as
> an argument.
>
OK
>> + while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, i))) {
>> + for (irq_num = res->start; irq_num <= res->end; irq_num++)
>> + free_irq(irq_num,
>> + (void *)(&vpif_obj.dev[i]->channel_id));
>
> A quick look at board code shows that each IRQ resource contains a single IRQ.
> The second loop could thus be removed. You could also add another patch to
> perform similar cleanup for the probe code.
>
Any way this will code will be removed in the next patch of the same
series due to usage
of devm_* api. I'll do this change only in the probe code.
Regards,
--Prabhakar Lad
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v3 5/9] media: davinci: vpif_capture: use module_platform_driver()
2013-05-26 12:00 [PATCH v3 0/9] media: davinci: vpif trivial cleanup Prabhakar Lad
` (3 preceding siblings ...)
2013-05-26 12:00 ` [PATCH v3 4/9] media: davinci: vpif_capture: move the freeing of irq and global variables to remove() Prabhakar Lad
@ 2013-05-26 12:00 ` Prabhakar Lad
2013-05-29 3:34 ` Laurent Pinchart
2013-05-26 12:00 ` [PATCH v3 6/9] media: davinci: vpif_capture: Convert to devm_* api Prabhakar Lad
` (3 subsequent siblings)
8 siblings, 1 reply; 19+ messages in thread
From: Prabhakar Lad @ 2013-05-26 12:00 UTC (permalink / raw)
To: Hans Verkuil, Mauro Carvalho Chehab, LMML, Laurent Pinchart
Cc: DLOS, LKML, Lad, Prabhakar
From: Lad, Prabhakar <prabhakar.csengg@gmail.com>
This patch uses module_platform_driver() to simplify the code.
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
---
drivers/media/platform/davinci/vpif_capture.c | 28 +------------------------
1 files changed, 1 insertions(+), 27 deletions(-)
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index f8b7304..38c1fba 100644
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -2338,30 +2338,4 @@ static __refdata struct platform_driver vpif_driver = {
.remove = vpif_remove,
};
-/**
- * vpif_init: initialize the vpif driver
- *
- * This function registers device and driver to the kernel, requests irq
- * handler and allocates memory
- * for channel objects
- */
-static __init int vpif_init(void)
-{
- return platform_driver_register(&vpif_driver);
-}
-
-/**
- * vpif_cleanup : This function clean up the vpif capture resources
- *
- * This will un-registers device and driver to the kernel, frees
- * requested irq handler and de-allocates memory allocated for channel
- * objects.
- */
-static void vpif_cleanup(void)
-{
- platform_driver_unregister(&vpif_driver);
-}
-
-/* Function for module initialization and cleanup */
-module_init(vpif_init);
-module_exit(vpif_cleanup);
+module_platform_driver(vpif_driver);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH v3 5/9] media: davinci: vpif_capture: use module_platform_driver()
2013-05-26 12:00 ` [PATCH v3 5/9] media: davinci: vpif_capture: use module_platform_driver() Prabhakar Lad
@ 2013-05-29 3:34 ` Laurent Pinchart
0 siblings, 0 replies; 19+ messages in thread
From: Laurent Pinchart @ 2013-05-29 3:34 UTC (permalink / raw)
To: Prabhakar Lad; +Cc: Hans Verkuil, Mauro Carvalho Chehab, LMML, DLOS, LKML
On Sunday 26 May 2013 17:30:08 Prabhakar Lad wrote:
> From: Lad, Prabhakar <prabhakar.csengg@gmail.com>
>
> This patch uses module_platform_driver() to simplify the code.
>
> Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> drivers/media/platform/davinci/vpif_capture.c | 28 +---------------------
> 1 files changed, 1 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/media/platform/davinci/vpif_capture.c
> b/drivers/media/platform/davinci/vpif_capture.c index f8b7304..38c1fba
> 100644
> --- a/drivers/media/platform/davinci/vpif_capture.c
> +++ b/drivers/media/platform/davinci/vpif_capture.c
> @@ -2338,30 +2338,4 @@ static __refdata struct platform_driver vpif_driver =
> { .remove = vpif_remove,
> };
>
> -/**
> - * vpif_init: initialize the vpif driver
> - *
> - * This function registers device and driver to the kernel, requests irq
> - * handler and allocates memory
> - * for channel objects
> - */
> -static __init int vpif_init(void)
> -{
> - return platform_driver_register(&vpif_driver);
> -}
> -
> -/**
> - * vpif_cleanup : This function clean up the vpif capture resources
> - *
> - * This will un-registers device and driver to the kernel, frees
> - * requested irq handler and de-allocates memory allocated for channel
> - * objects.
> - */
> -static void vpif_cleanup(void)
> -{
> - platform_driver_unregister(&vpif_driver);
> -}
> -
> -/* Function for module initialization and cleanup */
> -module_init(vpif_init);
> -module_exit(vpif_cleanup);
> +module_platform_driver(vpif_driver);
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v3 6/9] media: davinci: vpif_capture: Convert to devm_* api
2013-05-26 12:00 [PATCH v3 0/9] media: davinci: vpif trivial cleanup Prabhakar Lad
` (4 preceding siblings ...)
2013-05-26 12:00 ` [PATCH v3 5/9] media: davinci: vpif_capture: use module_platform_driver() Prabhakar Lad
@ 2013-05-26 12:00 ` Prabhakar Lad
2013-05-29 3:37 ` Laurent Pinchart
2013-05-26 12:00 ` [PATCH v3 7/9] media: davinci: vpif_display: move the freeing of irq and global variables to remove() Prabhakar Lad
` (2 subsequent siblings)
8 siblings, 1 reply; 19+ messages in thread
From: Prabhakar Lad @ 2013-05-26 12:00 UTC (permalink / raw)
To: Hans Verkuil, Mauro Carvalho Chehab, LMML, Laurent Pinchart
Cc: DLOS, LKML, Lad, Prabhakar
From: Lad, Prabhakar <prabhakar.csengg@gmail.com>
use devm_request_irq() instead of request_irq(). This ensures
more consistent error values and simplifies error paths.
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
---
drivers/media/platform/davinci/vpif_capture.c | 38 ++++++++-----------------
1 files changed, 12 insertions(+), 26 deletions(-)
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index 38c1fba..5e1e5f6 100644
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -2082,14 +2082,14 @@ static __init int vpif_probe(struct platform_device *pdev)
while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, res_idx))) {
for (i = res->start; i <= res->end; i++) {
- if (request_irq(i, vpif_channel_isr, IRQF_SHARED,
- "VPIF_Capture", (void *)
- (&vpif_obj.dev[res_idx]->channel_id))) {
- err = -EBUSY;
- for (j = 0; j < i; j++)
- free_irq(j, (void *)
- (&vpif_obj.dev[res_idx]->channel_id));
- goto vpif_int_err;
+ err = devm_request_irq(&pdev->dev, i, vpif_channel_isr,
+ IRQF_SHARED, "VPIF_Capture",
+ (void *)(&vpif_obj.dev[res_idx]->
+ channel_id));
+ if (err) {
+ err = -EINVAL;
+ goto vpif_unregister;
+
}
}
res_idx++;
@@ -2106,7 +2106,7 @@ static __init int vpif_probe(struct platform_device *pdev)
video_device_release(ch->video_dev);
}
err = -ENOMEM;
- goto vpif_int_err;
+ goto vpif_unregister;
}
/* Initialize field of video device */
@@ -2207,13 +2207,9 @@ vpif_sd_error:
/* Note: does nothing if ch->video_dev == NULL */
video_device_release(ch->video_dev);
}
-vpif_int_err:
+vpif_unregister:
v4l2_device_unregister(&vpif_obj.v4l2_dev);
- for (i = 0; i < res_idx; i++) {
- res = platform_get_resource(pdev, IORESOURCE_IRQ, i);
- for (j = res->start; j <= res->end; j++)
- free_irq(j, (void *)(&vpif_obj.dev[i]->channel_id));
- }
+
return err;
}
@@ -2225,18 +2221,8 @@ vpif_int_err:
*/
static int vpif_remove(struct platform_device *device)
{
- struct platform_device *pdev;
struct channel_obj *ch;
- struct resource *res;
- int irq_num, i = 0;
-
- pdev = container_of(vpif_dev, struct platform_device, dev);
- while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, i))) {
- for (irq_num = res->start; irq_num <= res->end; irq_num++)
- free_irq(irq_num,
- (void *)(&vpif_obj.dev[i]->channel_id));
- i++;
- }
+ int i;
v4l2_device_unregister(&vpif_obj.v4l2_dev);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH v3 6/9] media: davinci: vpif_capture: Convert to devm_* api
2013-05-26 12:00 ` [PATCH v3 6/9] media: davinci: vpif_capture: Convert to devm_* api Prabhakar Lad
@ 2013-05-29 3:37 ` Laurent Pinchart
0 siblings, 0 replies; 19+ messages in thread
From: Laurent Pinchart @ 2013-05-29 3:37 UTC (permalink / raw)
To: Prabhakar Lad; +Cc: Hans Verkuil, Mauro Carvalho Chehab, LMML, DLOS, LKML
On Sunday 26 May 2013 17:30:09 Prabhakar Lad wrote:
> From: Lad, Prabhakar <prabhakar.csengg@gmail.com>
>
> use devm_request_irq() instead of request_irq(). This ensures
> more consistent error values and simplifies error paths.
>
> Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> drivers/media/platform/davinci/vpif_capture.c | 38 ++++++++--------------
> 1 files changed, 12 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/media/platform/davinci/vpif_capture.c
> b/drivers/media/platform/davinci/vpif_capture.c index 38c1fba..5e1e5f6
> 100644
> --- a/drivers/media/platform/davinci/vpif_capture.c
> +++ b/drivers/media/platform/davinci/vpif_capture.c
> @@ -2082,14 +2082,14 @@ static __init int vpif_probe(struct platform_device
> *pdev)
>
> while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, res_idx))) {
> for (i = res->start; i <= res->end; i++) {
> - if (request_irq(i, vpif_channel_isr, IRQF_SHARED,
> - "VPIF_Capture", (void *)
> - (&vpif_obj.dev[res_idx]->channel_id))) {
> - err = -EBUSY;
> - for (j = 0; j < i; j++)
> - free_irq(j, (void *)
> - (&vpif_obj.dev[res_idx]->channel_id));
> - goto vpif_int_err;
> + err = devm_request_irq(&pdev->dev, i, vpif_channel_isr,
> + IRQF_SHARED, "VPIF_Capture",
> + (void *)(&vpif_obj.dev[res_idx]->
> + channel_id));
> + if (err) {
> + err = -EINVAL;
> + goto vpif_unregister;
> +
> }
> }
> res_idx++;
> @@ -2106,7 +2106,7 @@ static __init int vpif_probe(struct platform_device
> *pdev) video_device_release(ch->video_dev);
> }
> err = -ENOMEM;
> - goto vpif_int_err;
> + goto vpif_unregister;
> }
>
> /* Initialize field of video device */
> @@ -2207,13 +2207,9 @@ vpif_sd_error:
> /* Note: does nothing if ch->video_dev == NULL */
> video_device_release(ch->video_dev);
> }
> -vpif_int_err:
> +vpif_unregister:
> v4l2_device_unregister(&vpif_obj.v4l2_dev);
> - for (i = 0; i < res_idx; i++) {
> - res = platform_get_resource(pdev, IORESOURCE_IRQ, i);
> - for (j = res->start; j <= res->end; j++)
> - free_irq(j, (void *)(&vpif_obj.dev[i]->channel_id));
> - }
> +
> return err;
> }
>
> @@ -2225,18 +2221,8 @@ vpif_int_err:
> */
> static int vpif_remove(struct platform_device *device)
> {
> - struct platform_device *pdev;
> struct channel_obj *ch;
> - struct resource *res;
> - int irq_num, i = 0;
> -
> - pdev = container_of(vpif_dev, struct platform_device, dev);
> - while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, i))) {
> - for (irq_num = res->start; irq_num <= res->end; irq_num++)
> - free_irq(irq_num,
> - (void *)(&vpif_obj.dev[i]->channel_id));
> - i++;
> - }
> + int i;
>
> v4l2_device_unregister(&vpif_obj.v4l2_dev);
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v3 7/9] media: davinci: vpif_display: move the freeing of irq and global variables to remove()
2013-05-26 12:00 [PATCH v3 0/9] media: davinci: vpif trivial cleanup Prabhakar Lad
` (5 preceding siblings ...)
2013-05-26 12:00 ` [PATCH v3 6/9] media: davinci: vpif_capture: Convert to devm_* api Prabhakar Lad
@ 2013-05-26 12:00 ` Prabhakar Lad
2013-05-26 12:00 ` [PATCH v3 8/9] media: davinci: vpif_display: use module_platform_driver() Prabhakar Lad
2013-05-26 12:00 ` [PATCH v3 9/9] media: davinci: vpif_display: Convert to devm_* api Prabhakar Lad
8 siblings, 0 replies; 19+ messages in thread
From: Prabhakar Lad @ 2013-05-26 12:00 UTC (permalink / raw)
To: Hans Verkuil, Mauro Carvalho Chehab, LMML, Laurent Pinchart
Cc: DLOS, LKML, Lad, Prabhakar
From: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Ideally the freeing of irq's and the global variables needs to be
done in the remove() rather than module_exit(), this patch moves
the freeing up of irq's and freeing the memory allocated to channel
objects to remove() callback of struct platform_driver.
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
---
drivers/media/platform/davinci/vpif_display.c | 32 +++++++++++--------------
1 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index 5b6f906..9c308e7 100644
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -1894,11 +1894,23 @@ vpif_int_err:
*/
static int vpif_remove(struct platform_device *device)
{
+ struct platform_device *pdev;
struct channel_obj *ch;
- int i;
+ struct resource *res;
+ int irq_num;
+ int i = 0;
+
+ pdev = container_of(vpif_dev, struct platform_device, dev);
+ while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, i))) {
+ for (irq_num = res->start; irq_num <= res->end; irq_num++)
+ free_irq(irq_num,
+ (void *)(&vpif_obj.dev[i]->channel_id));
+ i++;
+ }
v4l2_device_unregister(&vpif_obj.v4l2_dev);
+ kfree(vpif_obj.sd);
/* un-register device */
for (i = 0; i < VPIF_DISPLAY_MAX_DEVICES; i++) {
/* Get the pointer to the channel object */
@@ -1907,6 +1919,7 @@ static int vpif_remove(struct platform_device *device)
video_unregister_device(ch->video_dev);
ch->video_dev = NULL;
+ kfree(vpif_obj.dev[i]);
}
return 0;
@@ -2004,24 +2017,7 @@ static __init int vpif_init(void)
*/
static void vpif_cleanup(void)
{
- struct platform_device *pdev;
- struct resource *res;
- int irq_num;
- int i = 0;
-
- pdev = container_of(vpif_dev, struct platform_device, dev);
-
- while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, i))) {
- for (irq_num = res->start; irq_num <= res->end; irq_num++)
- free_irq(irq_num,
- (void *)(&vpif_obj.dev[i]->channel_id));
- i++;
- }
-
platform_driver_unregister(&vpif_driver);
- kfree(vpif_obj.sd);
- for (i = 0; i < VPIF_DISPLAY_MAX_DEVICES; i++)
- kfree(vpif_obj.dev[i]);
}
module_init(vpif_init);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v3 8/9] media: davinci: vpif_display: use module_platform_driver()
2013-05-26 12:00 [PATCH v3 0/9] media: davinci: vpif trivial cleanup Prabhakar Lad
` (6 preceding siblings ...)
2013-05-26 12:00 ` [PATCH v3 7/9] media: davinci: vpif_display: move the freeing of irq and global variables to remove() Prabhakar Lad
@ 2013-05-26 12:00 ` Prabhakar Lad
2013-05-29 3:34 ` Laurent Pinchart
2013-05-26 12:00 ` [PATCH v3 9/9] media: davinci: vpif_display: Convert to devm_* api Prabhakar Lad
8 siblings, 1 reply; 19+ messages in thread
From: Prabhakar Lad @ 2013-05-26 12:00 UTC (permalink / raw)
To: Hans Verkuil, Mauro Carvalho Chehab, LMML, Laurent Pinchart
Cc: DLOS, LKML, Lad, Prabhakar
From: Lad, Prabhakar <prabhakar.csengg@gmail.com>
This patch uses module_platform_driver() to simplify the code.
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
---
drivers/media/platform/davinci/vpif_display.c | 18 +-----------------
1 files changed, 1 insertions(+), 17 deletions(-)
diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index 9c308e7..7bcfe7d 100644
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -2005,20 +2005,4 @@ static __refdata struct platform_driver vpif_driver = {
.remove = vpif_remove,
};
-static __init int vpif_init(void)
-{
- return platform_driver_register(&vpif_driver);
-}
-
-/*
- * vpif_cleanup: This function un-registers device and driver to the kernel,
- * frees requested irq handler and de-allocates memory allocated for channel
- * objects.
- */
-static void vpif_cleanup(void)
-{
- platform_driver_unregister(&vpif_driver);
-}
-
-module_init(vpif_init);
-module_exit(vpif_cleanup);
+module_platform_driver(vpif_driver);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH v3 8/9] media: davinci: vpif_display: use module_platform_driver()
2013-05-26 12:00 ` [PATCH v3 8/9] media: davinci: vpif_display: use module_platform_driver() Prabhakar Lad
@ 2013-05-29 3:34 ` Laurent Pinchart
0 siblings, 0 replies; 19+ messages in thread
From: Laurent Pinchart @ 2013-05-29 3:34 UTC (permalink / raw)
To: Prabhakar Lad; +Cc: Hans Verkuil, Mauro Carvalho Chehab, LMML, DLOS, LKML
On Sunday 26 May 2013 17:30:11 Prabhakar Lad wrote:
> From: Lad, Prabhakar <prabhakar.csengg@gmail.com>
>
> This patch uses module_platform_driver() to simplify the code.
>
> Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> drivers/media/platform/davinci/vpif_display.c | 18 +-----------------
> 1 files changed, 1 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/media/platform/davinci/vpif_display.c
> b/drivers/media/platform/davinci/vpif_display.c index 9c308e7..7bcfe7d
> 100644
> --- a/drivers/media/platform/davinci/vpif_display.c
> +++ b/drivers/media/platform/davinci/vpif_display.c
> @@ -2005,20 +2005,4 @@ static __refdata struct platform_driver vpif_driver =
> { .remove = vpif_remove,
> };
>
> -static __init int vpif_init(void)
> -{
> - return platform_driver_register(&vpif_driver);
> -}
> -
> -/*
> - * vpif_cleanup: This function un-registers device and driver to the
> kernel, - * frees requested irq handler and de-allocates memory allocated
> for channel - * objects.
> - */
> -static void vpif_cleanup(void)
> -{
> - platform_driver_unregister(&vpif_driver);
> -}
> -
> -module_init(vpif_init);
> -module_exit(vpif_cleanup);
> +module_platform_driver(vpif_driver);
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v3 9/9] media: davinci: vpif_display: Convert to devm_* api
2013-05-26 12:00 [PATCH v3 0/9] media: davinci: vpif trivial cleanup Prabhakar Lad
` (7 preceding siblings ...)
2013-05-26 12:00 ` [PATCH v3 8/9] media: davinci: vpif_display: use module_platform_driver() Prabhakar Lad
@ 2013-05-26 12:00 ` Prabhakar Lad
2013-05-29 3:38 ` Laurent Pinchart
8 siblings, 1 reply; 19+ messages in thread
From: Prabhakar Lad @ 2013-05-26 12:00 UTC (permalink / raw)
To: Hans Verkuil, Mauro Carvalho Chehab, LMML, Laurent Pinchart
Cc: DLOS, LKML, Lad, Prabhakar
From: Lad, Prabhakar <prabhakar.csengg@gmail.com>
use devm_request_irq() instead of request_irq(). This ensures
more consistent error values and simplifies error paths.
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
---
drivers/media/platform/davinci/vpif_display.c | 35 ++++++------------------
1 files changed, 9 insertions(+), 26 deletions(-)
diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index 7bcfe7d..e2f080b 100644
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -1718,15 +1718,14 @@ static __init int vpif_probe(struct platform_device *pdev)
while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, res_idx))) {
for (i = res->start; i <= res->end; i++) {
- if (request_irq(i, vpif_channel_isr, IRQF_SHARED,
- "VPIF_Display", (void *)
- (&vpif_obj.dev[res_idx]->channel_id))) {
- err = -EBUSY;
- for (j = 0; j < i; j++)
- free_irq(j, (void *)
- (&vpif_obj.dev[res_idx]->channel_id));
+ err = devm_request_irq(&pdev->dev, i, vpif_channel_isr,
+ IRQF_SHARED, "VPIF_Display",
+ (void *)(&vpif_obj.dev[res_idx]->
+ channel_id));
+ if (err) {
+ err = -EINVAL;
vpif_err("VPIF IRQ request failed\n");
- goto vpif_int_err;
+ goto vpif_unregister;
}
}
res_idx++;
@@ -1744,7 +1743,7 @@ static __init int vpif_probe(struct platform_device *pdev)
video_device_release(ch->video_dev);
}
err = -ENOMEM;
- goto vpif_int_err;
+ goto vpif_unregister;
}
/* Initialize field of video device */
@@ -1878,13 +1877,8 @@ vpif_sd_error:
/* Note: does nothing if ch->video_dev == NULL */
video_device_release(ch->video_dev);
}
-vpif_int_err:
+vpif_unregister:
v4l2_device_unregister(&vpif_obj.v4l2_dev);
- for (i = 0; i < res_idx; i++) {
- res = platform_get_resource(pdev, IORESOURCE_IRQ, i);
- for (j = res->start; j <= res->end; j++)
- free_irq(j, (void *)(&vpif_obj.dev[i]->channel_id));
- }
return err;
}
@@ -1894,20 +1888,9 @@ vpif_int_err:
*/
static int vpif_remove(struct platform_device *device)
{
- struct platform_device *pdev;
struct channel_obj *ch;
- struct resource *res;
- int irq_num;
int i = 0;
- pdev = container_of(vpif_dev, struct platform_device, dev);
- while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, i))) {
- for (irq_num = res->start; irq_num <= res->end; irq_num++)
- free_irq(irq_num,
- (void *)(&vpif_obj.dev[i]->channel_id));
- i++;
- }
-
v4l2_device_unregister(&vpif_obj.v4l2_dev);
kfree(vpif_obj.sd);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH v3 9/9] media: davinci: vpif_display: Convert to devm_* api
2013-05-26 12:00 ` [PATCH v3 9/9] media: davinci: vpif_display: Convert to devm_* api Prabhakar Lad
@ 2013-05-29 3:38 ` Laurent Pinchart
2013-05-29 4:15 ` Prabhakar Lad
0 siblings, 1 reply; 19+ messages in thread
From: Laurent Pinchart @ 2013-05-29 3:38 UTC (permalink / raw)
To: Prabhakar Lad; +Cc: Hans Verkuil, Mauro Carvalho Chehab, LMML, DLOS, LKML
On Sunday 26 May 2013 17:30:12 Prabhakar Lad wrote:
> From: Lad, Prabhakar <prabhakar.csengg@gmail.com>
>
> use devm_request_irq() instead of request_irq(). This ensures
> more consistent error values and simplifies error paths.
>
> Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
with a small comment below.
> ---
> drivers/media/platform/davinci/vpif_display.c | 35 ++++++----------------
> 1 files changed, 9 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/media/platform/davinci/vpif_display.c
> b/drivers/media/platform/davinci/vpif_display.c index 7bcfe7d..e2f080b
> 100644
> --- a/drivers/media/platform/davinci/vpif_display.c
> +++ b/drivers/media/platform/davinci/vpif_display.c
> @@ -1718,15 +1718,14 @@ static __init int vpif_probe(struct platform_device
> *pdev)
>
> while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, res_idx))) {
> for (i = res->start; i <= res->end; i++) {
> - if (request_irq(i, vpif_channel_isr, IRQF_SHARED,
> - "VPIF_Display", (void *)
> - (&vpif_obj.dev[res_idx]->channel_id))) {
> - err = -EBUSY;
> - for (j = 0; j < i; j++)
> - free_irq(j, (void *)
> - (&vpif_obj.dev[res_idx]->channel_id));
> + err = devm_request_irq(&pdev->dev, i, vpif_channel_isr,
> + IRQF_SHARED, "VPIF_Display",
> + (void *)(&vpif_obj.dev[res_idx]->
> + channel_id));
> + if (err) {
> + err = -EINVAL;
> vpif_err("VPIF IRQ request failed\n");
> - goto vpif_int_err;
> + goto vpif_unregister;
> }
> }
> res_idx++;
> @@ -1744,7 +1743,7 @@ static __init int vpif_probe(struct platform_device
> *pdev) video_device_release(ch->video_dev);
> }
> err = -ENOMEM;
> - goto vpif_int_err;
> + goto vpif_unregister;
> }
>
> /* Initialize field of video device */
> @@ -1878,13 +1877,8 @@ vpif_sd_error:
> /* Note: does nothing if ch->video_dev == NULL */
> video_device_release(ch->video_dev);
> }
> -vpif_int_err:
> +vpif_unregister:
> v4l2_device_unregister(&vpif_obj.v4l2_dev);
> - for (i = 0; i < res_idx; i++) {
> - res = platform_get_resource(pdev, IORESOURCE_IRQ, i);
> - for (j = res->start; j <= res->end; j++)
> - free_irq(j, (void *)(&vpif_obj.dev[i]->channel_id));
> - }
>
> return err;
> }
> @@ -1894,20 +1888,9 @@ vpif_int_err:
> */
> static int vpif_remove(struct platform_device *device)
> {
> - struct platform_device *pdev;
> struct channel_obj *ch;
> - struct resource *res;
> - int irq_num;
> int i = 0;
There's no need to initialize i to 0 anymore (same comment for patch 6/9).
> - pdev = container_of(vpif_dev, struct platform_device, dev);
> - while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, i))) {
> - for (irq_num = res->start; irq_num <= res->end; irq_num++)
> - free_irq(irq_num,
> - (void *)(&vpif_obj.dev[i]->channel_id));
> - i++;
> - }
> -
> v4l2_device_unregister(&vpif_obj.v4l2_dev);
>
> kfree(vpif_obj.sd);
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH v3 9/9] media: davinci: vpif_display: Convert to devm_* api
2013-05-29 3:38 ` Laurent Pinchart
@ 2013-05-29 4:15 ` Prabhakar Lad
0 siblings, 0 replies; 19+ messages in thread
From: Prabhakar Lad @ 2013-05-29 4:15 UTC (permalink / raw)
To: Laurent Pinchart; +Cc: Hans Verkuil, Mauro Carvalho Chehab, LMML, DLOS, LKML
Hi Laurent,
On Wed, May 29, 2013 at 9:08 AM, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> On Sunday 26 May 2013 17:30:12 Prabhakar Lad wrote:
>> From: Lad, Prabhakar <prabhakar.csengg@gmail.com>
>>
>> use devm_request_irq() instead of request_irq(). This ensures
>> more consistent error values and simplifies error paths.
>>
>> Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
>
> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>
Thanks for the ack.
> with a small comment below.
>
>> ---
>> drivers/media/platform/davinci/vpif_display.c | 35 ++++++----------------
>> 1 files changed, 9 insertions(+), 26 deletions(-)
>>
>> diff --git a/drivers/media/platform/davinci/vpif_display.c
>> b/drivers/media/platform/davinci/vpif_display.c index 7bcfe7d..e2f080b
>> 100644
>> --- a/drivers/media/platform/davinci/vpif_display.c
>> +++ b/drivers/media/platform/davinci/vpif_display.c
>> @@ -1718,15 +1718,14 @@ static __init int vpif_probe(struct platform_device
>> *pdev)
>>
>> while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, res_idx))) {
>> for (i = res->start; i <= res->end; i++) {
>> - if (request_irq(i, vpif_channel_isr, IRQF_SHARED,
>> - "VPIF_Display", (void *)
>> - (&vpif_obj.dev[res_idx]->channel_id))) {
>> - err = -EBUSY;
>> - for (j = 0; j < i; j++)
>> - free_irq(j, (void *)
>> - (&vpif_obj.dev[res_idx]->channel_id));
>> + err = devm_request_irq(&pdev->dev, i, vpif_channel_isr,
>> + IRQF_SHARED, "VPIF_Display",
>> + (void *)(&vpif_obj.dev[res_idx]->
>> + channel_id));
>> + if (err) {
>> + err = -EINVAL;
>> vpif_err("VPIF IRQ request failed\n");
>> - goto vpif_int_err;
>> + goto vpif_unregister;
>> }
>> }
>> res_idx++;
>> @@ -1744,7 +1743,7 @@ static __init int vpif_probe(struct platform_device
>> *pdev) video_device_release(ch->video_dev);
>> }
>> err = -ENOMEM;
>> - goto vpif_int_err;
>> + goto vpif_unregister;
>> }
>>
>> /* Initialize field of video device */
>> @@ -1878,13 +1877,8 @@ vpif_sd_error:
>> /* Note: does nothing if ch->video_dev == NULL */
>> video_device_release(ch->video_dev);
>> }
>> -vpif_int_err:
>> +vpif_unregister:
>> v4l2_device_unregister(&vpif_obj.v4l2_dev);
>> - for (i = 0; i < res_idx; i++) {
>> - res = platform_get_resource(pdev, IORESOURCE_IRQ, i);
>> - for (j = res->start; j <= res->end; j++)
>> - free_irq(j, (void *)(&vpif_obj.dev[i]->channel_id));
>> - }
>>
>> return err;
>> }
>> @@ -1894,20 +1888,9 @@ vpif_int_err:
>> */
>> static int vpif_remove(struct platform_device *device)
>> {
>> - struct platform_device *pdev;
>> struct channel_obj *ch;
>> - struct resource *res;
>> - int irq_num;
>> int i = 0;
>
> There's no need to initialize i to 0 anymore (same comment for patch 6/9).
>
Ok will fix it in the next version.
Regards,
--Prabhakar Lad
^ permalink raw reply [flat|nested] 19+ messages in thread