Skip to contentSkip to conversation

drivers/media/video/cx23885 needs kfifo conversion

PATCH Applied [email protected] 4 participants 5 messages Mar 11, 2010 – Mar 15, 2010 Media (V4L/DVB)

lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 1/5 drivers/media/video/cx23885 needs kfifo conversion

From: Andrew Morton <[email protected]>

linux-next:

drivers/media/video/cx23885/cx23888-ir.c: In function 'cx23888_ir_irq_handler':
drivers/media/video/cx23885/cx23888-ir.c:597: error: implicit declaration of function 'kfifo_put' drivers/media/video/cx23885/cx23888-ir.c: In function 'cx23888_ir_rx_read':
drivers/media/video/cx23885/cx23888-ir.c:660: error: implicit declaration of function 'kfifo_get' drivers/media/video/cx23885/cx23888-ir.c: In function 'cx23888_ir_probe':
drivers/media/video/cx23885/cx23888-ir.c:1172: warning: passing argument 1 of 'kfifo_alloc' makes pointer from integer without a cast drivers/media/video/cx23885/cx23888-ir.c:1172: warning: passing argument 3 of 'kfifo_alloc' makes integer from pointer without a cast drivers/media/video/cx23885/cx23888-ir.c:1172: warning: assignment makes pointer from integer without a cast drivers/media/video/cx23885/cx23888-ir.c:1178: warning: passing argument 1 of 'kfifo_alloc' makes pointer from integer without a cast drivers/media/video/cx23885/cx23888-ir.c:1178: warning: passing argument 3 of 'kfifo_alloc' makes integer from pointer without a cast drivers/media/video/cx23885/cx23888-ir.c:1178: warning: assignment makes pointer from integer without a cast

Cc: Stefani Seibold <[email protected]>
DESC
drivers/media/video/cx23885: needs kfifo updates
EDESC
From: Andrew Morton <[email protected]>

linux-next again.

Cc Stefani Seibold <[email protected]>
Signed-off-by Andrew Morton <[email protected]>

---

 drivers/media/video/cx231xx/Kconfig |    1 +
 drivers/media/video/cx23885/Kconfig |    1 +
 2 files changed, 2 insertions(+)
drivers/media/video/cx231xx/Kconfig renamed from drivers/media/video/cx231xx/Kconfig~drivers-media-video-cx23885-needs-kfifo-conversion +1 -0
diff -puN drivers/media/video/cx231xx/Kconfig~drivers-media-video-cx23885-needs-kfifo-conversion drivers/media/video/cx231xx/Kconfig
@@ -1,6 +1,7 @@
 config VIDEO_CX231XX
 	tristate "Conexant cx231xx USB video capture support"
 	depends on VIDEO_DEV && I2C && INPUT
+	depends on BROKEN
 	select VIDEO_TUNER
 	select VIDEO_TVEEPROM
 	select VIDEO_IR
drivers/media/video/cx23885/Kconfig renamed from drivers/media/video/cx23885/Kconfig~drivers-media-video-cx23885-needs-kfifo-conversion +1 -0
diff -puN drivers/media/video/cx23885/Kconfig~drivers-media-video-cx23885-needs-kfifo-conversion drivers/media/video/cx23885/Kconfig
@@ -1,6 +1,7 @@
 config VIDEO_CX23885
 	tristate "Conexant cx23885 (2388x successor) support"
 	depends on DVB_CORE && VIDEO_DEV && PCI && I2C && INPUT
+	depends on BROKEN
 	select I2C_ALGOBIT
 	select VIDEO_BTCX
 	select VIDEO_TUNER

_

#1 lore raw

Am Donnerstag, den 11.03.2010, 14:02 -0800 schrieb [email protected]:

Quoted 4 lines

From: Andrew Morton <[email protected]>

linux-next:

Quoted 12 lines

drivers/media/video/cx23885/cx23888-ir.c: In function 'cx23888_ir_irq_handler':
drivers/media/video/cx23885/cx23888-ir.c:597: error: implicit declaration of function 'kfifo_put' drivers/media/video/cx23885/cx23888-ir.c: In function 'cx23888_ir_rx_read':
drivers/media/video/cx23885/cx23888-ir.c:660: error: implicit declaration of function 'kfifo_get' drivers/media/video/cx23885/cx23888-ir.c: In function 'cx23888_ir_probe':
drivers/media/video/cx23885/cx23888-ir.c:1172: warning: passing argument 1 of 'kfifo_alloc' makes pointer from integer without a cast drivers/media/video/cx23885/cx23888-ir.c:1172: warning: passing argument 3 of 'kfifo_alloc' makes integer from pointer without a cast drivers/media/video/cx23885/cx23888-ir.c:1172: warning: assignment makes pointer from integer without a cast drivers/media/video/cx23885/cx23888-ir.c:1178: warning: passing argument 1 of 'kfifo_alloc' makes pointer from integer without a cast drivers/media/video/cx23885/cx23888-ir.c:1178: warning: passing argument 3 of 'kfifo_alloc' makes integer from pointer without a cast drivers/media/video/cx23885/cx23888-ir.c:1178: warning: assignment makes pointer from integer without a cast

This looks fine in 2.6.33. I don't know who reverted it in linux-next.

#2 lore raw
Quoted 19 lines · Stefani Seibold

Am Donnerstag, den 11.03.2010, 14:02 -0800 schrieb [email protected]:

Quoted 4 lines

From: Andrew Morton <[email protected]>

linux-next:

Quoted 12 lines

drivers/media/video/cx23885/cx23888-ir.c: In function 'cx23888_ir_irq_handler':
drivers/media/video/cx23885/cx23888-ir.c:597: error: implicit declaration of function 'kfifo_put' drivers/media/video/cx23885/cx23888-ir.c: In function 'cx23888_ir_rx_read':
drivers/media/video/cx23885/cx23888-ir.c:660: error: implicit declaration of function 'kfifo_get' drivers/media/video/cx23885/cx23888-ir.c: In function 'cx23888_ir_probe':
drivers/media/video/cx23885/cx23888-ir.c:1172: warning: passing argument 1 of 'kfifo_alloc' makes pointer from integer without a cast drivers/media/video/cx23885/cx23888-ir.c:1172: warning: passing argument 3 of 'kfifo_alloc' makes integer from pointer without a cast drivers/media/video/cx23885/cx23888-ir.c:1172: warning: assignment makes pointer from integer without a cast drivers/media/video/cx23885/cx23888-ir.c:1178: warning: passing argument 1 of 'kfifo_alloc' makes pointer from integer without a cast drivers/media/video/cx23885/cx23888-ir.c:1178: warning: passing argument 3 of 'kfifo_alloc' makes integer from pointer without a cast drivers/media/video/cx23885/cx23888-ir.c:1178: warning: assignment makes pointer from integer without a cast

Quoted 2 lines

This looks fine in 2.6.33. I don't know who reverted it in linux-next.

Things also look OK at the v4l-dvb GIT repositories:

http://git.linuxtv.org/v4l-dvb.git?a=blob;f=drivers/media/video/cx23885/cx23888-ir.c;hb=HEAD

http://git.linuxtv.org/linux-2.6.git?a=blob;f=drivers/media/video/cx23885/cx23888-ir.c;hb=HEAD

As far as I recall, this file should not have changed since the original changes for the new kfifo implementation.

Regards,
Andy

NAK
#3 lore raw
In reply to [email protected]
Quoted 36 lines · On Thu, 2010-03-11 at 14:02 -0800, [email protected] wrote:

From: Andrew Morton <[email protected]>

linux-next:

drivers/media/video/cx23885/cx23888-ir.c: In function 'cx23888_ir_irq_handler':
drivers/media/video/cx23885/cx23888-ir.c:597: error: implicit declaration of function 'kfifo_put' drivers/media/video/cx23885/cx23888-ir.c: In function 'cx23888_ir_rx_read':
drivers/media/video/cx23885/cx23888-ir.c:660: error: implicit declaration of function 'kfifo_get' drivers/media/video/cx23885/cx23888-ir.c: In function 'cx23888_ir_probe':
drivers/media/video/cx23885/cx23888-ir.c:1172: warning: passing argument 1 of 'kfifo_alloc' makes pointer from integer without a cast drivers/media/video/cx23885/cx23888-ir.c:1172: warning: passing argument 3 of 'kfifo_alloc' makes integer from pointer without a cast drivers/media/video/cx23885/cx23888-ir.c:1172: warning: assignment makes pointer from integer without a cast drivers/media/video/cx23885/cx23888-ir.c:1178: warning: passing argument 1 of 'kfifo_alloc' makes pointer from integer without a cast drivers/media/video/cx23885/cx23888-ir.c:1178: warning: passing argument 3 of 'kfifo_alloc' makes integer from pointer without a cast drivers/media/video/cx23885/cx23888-ir.c:1178: warning: assignment makes pointer from integer without a cast

Cc: Stefani Seibold <[email protected]>
DESC
drivers/media/video/cx23885: needs kfifo updates
EDESC
From: Andrew Morton <[email protected]>

linux-next again.

Cc Stefani Seibold <[email protected]>
Signed-off-by Andrew Morton <[email protected]>

---

 drivers/media/video/cx231xx/Kconfig |    1 +
 drivers/media/video/cx23885/Kconfig |    1 +
 2 files changed, 2 insertions(+)

diff -puN drivers/media/video/cx231xx/Kconfig~drivers-media-video-cx23885-needs-kfifo-conversion drivers/media/video/cx231xx/Kconfig

drivers/media/video/cx231xx/Kconfig line 7

Quoted 7 lines
drivers/media/video/cx231xx/Kconfig renamed from drivers/media/video/cx231xx/Kconfig~drivers-media-video-cx23885-needs-kfifo-conversion +1 -0
@@ -1,6 +1,7 @@
 config VIDEO_CX231XX
 	tristate "Conexant cx231xx USB video capture support"
 	depends on VIDEO_DEV && I2C && INPUT
+	depends on BROKEN
 	select VIDEO_TUNER
 	select VIDEO_TVEEPROM
 	select VIDEO_IR

NAck.

What does the cx231xx driver have to do with a cx23885 driver build problem?

Quoted 11 lines

diff -puN drivers/media/video/cx23885/Kconfig~drivers-media-video-cx23885-needs-kfifo-conversion drivers/media/video/cx23885/Kconfig

drivers/media/video/cx23885/Kconfig renamed from drivers/media/video/cx23885/Kconfig~drivers-media-video-cx23885-needs-kfifo-conversion +1 -0
@@ -1,6 +1,7 @@
 config VIDEO_CX23885
 	tristate "Conexant cx23885 (2388x successor) support"
 	depends on DVB_CORE && VIDEO_DEV && PCI && I2C && INPUT
+	depends on BROKEN
 	select I2C_ALGOBIT
 	select VIDEO_BTCX
 	select VIDEO_TUNER
Quoted 1 line

_

You should also Cc: Steve Toth if you are proposing disabling the cx23885 driver.

Steve,

To bring you up to speed, it looks like someone errantly reverted some cx23888-ir.c changes for kfifo from linux-next, when the code in 2.6.33 was correct.

Regards,
Andy

#4 lore raw
In reply to [email protected]

Hi Andrew,

You can drop this patch. The conversion to the new kfifo API happened on this patch:

commit 7801edb0b8b66e83c13623b483bc2e846c007c9d

Author:     Stefani Seibold <[email protected]>
AuthorDate: Mon Dec 21 14:37:33 2009 -0800
Commit:     Linus Torvalds <[email protected]>
CommitDate: Tue Dec 22 14:17:57 2009 -0800

media video cx23888 driver: ported to new kfifo API

The patch is already upstream.

Cheers,
Mauro