Skip to contentSkip to conversation

V4L/DVB: s5p-fimc: make it compile

PATCH In review Dan Carpenter 2 participants 3 messages Oct 21, 2010 – Oct 22, 2010

Subsystems (2)
Media (V4L/DVB) Kernel janitors
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 2/3 V4L/DVB: s5p-fimc: make it compile

The work_queue was partially removed in f93000ac11: "[media] s5p-fimc:
mem2mem driver refactoring and cleanup" but this bit was missed. Also we need to include sched.h otherwise the compile fails with:

drivers/media/video/s5p-fimc/fimc-core.c:
In function ‘fimc_capture_handler’:
drivers/media/video/s5p-fimc/fimc-core.c:286:
error: ‘TASK_NORMAL’ undeclared (first use in this function)

Signed-off-by Dan Carpenter <[email protected]>

---
Compile tested only. :P

drivers/media/video/s5p-fimc/fimc-core.h +1 -0
index e3a7c6a..1c1437c 100644
@@ -14,6 +14,7 @@
 /*#define DEBUG*/
 
 #include <linux/types.h>
+#include <linux/sched.h>
 #include <media/videobuf-core.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-mem2mem.h>
drivers/media/video/s5p-fimc/fimc-core.c +0 -6
index 8335045..cf9bc8e 100644
@@ -1593,12 +1593,6 @@ static int fimc_probe(struct platform_device *pdev)
 		goto err_clk;
 	}
 
-	fimc->work_queue = create_workqueue(dev_name(&fimc->pdev->dev));
-	if (!fimc->work_queue) {
-		ret = -ENOMEM;
-		goto err_irq;
-	}
-
 	ret = fimc_register_m2m_device(fimc);
 	if (ret)
 		goto err_irq;
#1 lore raw
Quoted 40 lines

-----Original Message-----
From: Dan Carpenter [mailto:[email protected]]
Sent: Thursday, October 21, 2010 9:24 PM
To: Mauro Carvalho Chehab
Cc: Kyungmin Park; Sylwester Nawrocki; Marek Szyprowski; Pawel Osciak; [email protected]; [email protected]
Subject: [patch 2/3] V4L/DVB: s5p-fimc: make it compile

The work_queue was partially removed in f93000ac11: "[media] s5p-fimc:
mem2mem driver refactoring and cleanup" but this bit was missed. Also we need to include sched.h otherwise the compile fails with:

drivers/media/video/s5p-fimc/fimc-core.c:
In function ‘fimc_capture_handler’:
drivers/media/video/s5p-fimc/fimc-core.c:286:
error: ‘TASK_NORMAL’ undeclared (first use in this function)

Signed-off-by Dan Carpenter <[email protected]>

---
Compile tested only. :P

drivers/media/video/s5p-fimc/fimc-core.h +1 -0
index e3a7c6a..1c1437c 100644
@@ -14,6 +14,7 @@
 /*#define DEBUG*/
 
 #include <linux/types.h>
+#include <linux/sched.h>
 #include <media/videobuf-core.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-mem2mem.h>
drivers/media/video/s5p-fimc/fimc-core.c +0 -0
index 8335045..cf9bc8e 100644

drivers/media/video/s5p-fimc/fimc-core.c static int fimc_probe(struct platform_device · line 1602

Quoted 10 lines
drivers/media/video/s5p-fimc/fimc-core.c +0 -6
@@ -1593,12 +1593,6 @@ static int fimc_probe(struct platform_device
 *pdev)
 		goto err_clk;
 	}
 
-	fimc->work_queue = create_workqueue(dev_name(&fimc->pdev->dev));
-	if (!fimc->work_queue) {
-		ret = -ENOMEM;
-		goto err_irq;
-	}
-

This code is properly removed in my original patch. But it has been added again during a merge conflict solving. Unfortunately I cannot identify the merge commit today in linux-next.
As for sched.h, it needs a separate patch so I could handle it and add you as reported by it is OK.

Regards,
Sylwester

Quoted 3 lines
drivers/media/video/s5p-fimc/fimc-core.c +0 -0
 	ret = fimc_register_m2m_device(fimc);
 	if (ret)

goto err_irq;

author
#2 lore raw
Quoted 7 lines · Sylwester Nawrocki

This code is properly removed in my original patch. But it has been added again during a merge conflict solving. Unfortunately I cannot identify the merge commit today in linux-next.
As for sched.h, it needs a separate patch so I could handle it and add you as reported by it is OK.

I thought it was probably a merge conflict. Thanks for taking care of this.

regards,
dan carpenter

Quoted 6 lines

Regards,
Sylwester

Quoted 3 lines
drivers/media/video/s5p-fimc/fimc-core.c +0 -0
 	ret = fimc_register_m2m_device(fimc);
 	if (ret)
 		goto err_irq;