[1/5] drivers/media/video/cx23885 needs kfifo conversion

Message ID	201003112202.o2BM2FgS013122@imap1.linux-foundation.org (mailing list archive)
State	Superseded, archived
Headers	Envelope-to: mchehab@infradead.org Delivery-date: Thu, 11 Mar 2010 22:02:40 +0000 Message-Id: <201003112202.o2BM2FgS013122@imap1.linux-foundation.org> Subject: [patch 1/5] drivers/media/video/cx23885 needs kfifo conversion To: mchehab@infradead.org Cc: linux-media@vger.kernel.org, akpm@linux-foundation.org, stefani@seibold.net From: akpm@linux-foundation.org Date: Thu, 11 Mar 2010 14:02:15 -0800 MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk

Message ID

201003112202.o2BM2FgS013122@imap1.linux-foundation.org (mailing list archive)

State

Superseded, archived

Headers

Envelope-to: mchehab@infradead.org
Delivery-date: Thu, 11 Mar 2010 22:02:40 +0000
Message-Id: <201003112202.o2BM2FgS013122@imap1.linux-foundation.org>
Subject: [patch 1/5] drivers/media/video/cx23885 needs kfifo conversion
To: mchehab@infradead.org
Cc: linux-media@vger.kernel.org, akpm@linux-foundation.org,
	stefani@seibold.net
From: akpm@linux-foundation.org
Date: Thu, 11 Mar 2010 14:02:15 -0800
MIME-Version: 1.0
Content-Type: text/plain; charset=ANSI_X3.4-1968
Content-Transfer-Encoding: 8bit
Sender: linux-media-owner@vger.kernel.org
Precedence: bulk

Commit Message

Andrew Morton March 11, 2010, 10:02 p.m. UTC

  From: Andrew Morton <akpm@linux-foundation.org>

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 <stefani@seibold.net>
DESC
drivers/media/video/cx23885: needs kfifo updates
EDESC
From: Andrew Morton <akpm@linux-foundation.org>

linux-next again.

Cc: Stefani Seibold <stefani@seibold.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

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

Comments

Stefani Seibold March 13, 2010, 12:59 p.m. UTC | #1

Am Donnerstag, den 11.03.2010, 14:02 -0800 schrieb
akpm@linux-foundation.org:
> From: Andrew Morton <akpm@linux-foundation.org>
> 
> 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
> 

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


--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Andy Walls March 13, 2010, 5:50 p.m. UTC | #2

On Sat, 2010-03-13 at 13:59 +0100, Stefani Seibold wrote:
> Am Donnerstag, den 11.03.2010, 14:02 -0800 schrieb
> akpm@linux-foundation.org:
> > From: Andrew Morton <akpm@linux-foundation.org>
> > 
> > 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
> > 
> 
> 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


--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Andy Walls March 13, 2010, 6:52 p.m. UTC | #3

On Thu, 2010-03-11 at 14:02 -0800, akpm@linux-foundation.org wrote:
> From: Andrew Morton <akpm@linux-foundation.org>
> 
> 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 <stefani@seibold.net>
> DESC
> drivers/media/video/cx23885: needs kfifo updates
> EDESC
> From: Andrew Morton <akpm@linux-foundation.org>
> 
> linux-next again.
> 
> Cc: Stefani Seibold <stefani@seibold.net>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
> 
>  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
> --- a/drivers/media/video/cx231xx/Kconfig~drivers-media-video-cx23885-needs-kfifo-conversion
> +++ a/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

NAck.

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


> diff -puN drivers/media/video/cx23885/Kconfig~drivers-media-video-cx23885-needs-kfifo-conversion drivers/media/video/cx23885/Kconfig
> --- a/drivers/media/video/cx23885/Kconfig~drivers-media-video-cx23885-needs-kfifo-conversion
> +++ a/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
> _

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

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Mauro Carvalho Chehab March 15, 2010, 11:52 a.m. UTC | #4

Hi Andrew,

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

commit 7801edb0b8b66e83c13623b483bc2e846c007c9d
Author:     Stefani Seibold <stefani@seibold.net>
AuthorDate: Mon Dec 21 14:37:33 2009 -0800
Commit:     Linus Torvalds <torvalds@linux-foundation.org>
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
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

diff mbox

Patch

diff -puN drivers/media/video/cx231xx/Kconfig~drivers-media-video-cx23885-needs-kfifo-conversion drivers/media/video/cx231xx/Kconfig
--- a/drivers/media/video/cx231xx/Kconfig~drivers-media-video-cx23885-needs-kfifo-conversion
+++ a/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
diff -puN drivers/media/video/cx23885/Kconfig~drivers-media-video-cx23885-needs-kfifo-conversion drivers/media/video/cx23885/Kconfig
--- a/drivers/media/video/cx23885/Kconfig~drivers-media-video-cx23885-needs-kfifo-conversion
+++ a/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