[PATCH 1/3] i2c: Delete unused adapter IDs

[PATCH 1/3] i2c: Delete unused adapter IDs

[Jean Delvare]

Delete unused I2C adapter IDs. Special cases are:

* I2C_HW_B_RIVA was still set in driver rivafb, however no other
  driver is ever looking for this value, so we can safely remove it.
* I2C_HW_B_HDPVR is used in staging driver lirc_zilog, however no
  adapter ID is ever set to this value, so the code in question never
  runs. As the code additionally expects that I2C_HW_B_HDPVR may not
  be defined, we can delete it now and let the lirc_zilog driver
  maintainer rewrite this piece of code.

Big thanks for Hans Verkuil for doing all the hard work :)

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Jarod Wilson <jarod@redhat.com>
---
 drivers/video/riva/rivafb-i2c.c |    1 -
 include/linux/i2c-id.h          |   22 ----------------------
 2 files changed, 23 deletions(-)

--- linux-2.6.37-rc1.orig/include/linux/i2c-id.h	2010-11-05 13:55:17.000000000 +0100
+++ linux-2.6.37-rc1/include/linux/i2c-id.h	2010-11-05 15:05:32.000000000 +0100
@@ -32,28 +32,6 @@
  */
 
 /* --- Bit algorithm adapters						*/
-#define I2C_HW_B_BT848		0x010005 /* BT848 video boards */
-#define I2C_HW_B_RIVA		0x010010 /* Riva based graphics cards */
-#define I2C_HW_B_ZR36067	0x010019 /* Zoran-36057/36067 based boards */
 #define I2C_HW_B_CX2388x	0x01001b /* connexant 2388x based tv cards */
-#define I2C_HW_B_EM28XX		0x01001f /* em28xx video capture cards */
-#define I2C_HW_B_CX2341X	0x010020 /* Conexant CX2341X MPEG encoder cards */
-#define I2C_HW_B_CX23885	0x010022 /* conexant 23885 based tv cards (bus1) */
-#define I2C_HW_B_AU0828		0x010023 /* auvitek au0828 usb bridge */
-#define I2C_HW_B_CX231XX	0x010024 /* Conexant CX231XX USB based cards */
-#define I2C_HW_B_HDPVR		0x010025 /* Hauppauge HD PVR */
-
-/* --- SGI adapters							*/
-#define I2C_HW_SGI_VINO		0x160000
-
-/* --- SMBus only adapters						*/
-#define I2C_HW_SMBUS_W9968CF	0x04000d
-#define I2C_HW_SMBUS_OV511	0x04000e /* OV511(+) USB 1.1 webcam ICs */
-#define I2C_HW_SMBUS_OV518	0x04000f /* OV518(+) USB 1.1 webcam ICs */
-#define I2C_HW_SMBUS_CAFE	0x040012 /* Marvell 88ALP01 "CAFE" cam  */
-
-/* --- Miscellaneous adapters */
-#define I2C_HW_SAA7146		0x060000 /* SAA7146 video decoder bus */
-#define I2C_HW_SAA7134		0x090000 /* SAA7134 video decoder bus */
 
 #endif /* LINUX_I2C_ID_H */
--- linux-2.6.37-rc1.orig/drivers/video/riva/rivafb-i2c.c	2010-11-05 13:55:17.000000000 +0100
+++ linux-2.6.37-rc1/drivers/video/riva/rivafb-i2c.c	2010-11-05 13:55:19.000000000 +0100
@@ -94,7 +94,6 @@ static int __devinit riva_setup_i2c_bus(
 
 	strcpy(chan->adapter.name, name);
 	chan->adapter.owner		= THIS_MODULE;
-	chan->adapter.id		= I2C_HW_B_RIVA;
 	chan->adapter.class		= i2c_class;
 	chan->adapter.algo_data		= &chan->algo;
 	chan->adapter.dev.parent	= &chan->par->pdev->dev;


-- 
Jean Delvare

Re: [PATCH 1/3] i2c: Delete unused adapter IDs

[Jarod Wilson]

On Nov 5, 2010, at 4:06 PM, Jean Delvare wrote:

> Delete unused I2C adapter IDs. Special cases are:
> 
> * I2C_HW_B_RIVA was still set in driver rivafb, however no other
>  driver is ever looking for this value, so we can safely remove it.
> * I2C_HW_B_HDPVR is used in staging driver lirc_zilog, however no
>  adapter ID is ever set to this value, so the code in question never
>  runs. As the code additionally expects that I2C_HW_B_HDPVR may not
>  be defined, we can delete it now and let the lirc_zilog driver
>  maintainer rewrite this piece of code.
> 
> Big thanks for Hans Verkuil for doing all the hard work :)
> 
> Signed-off-by: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>
> Cc: Hans Verkuil <hverkuil-qWit8jRvyhVmR6Xm/wNWPw@public.gmane.org>
> Cc: Jarod Wilson <jarod-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

I think I2C_HW_B_HDPVR was only being used by a not-yet-merged-upstream patch to the hdpvr driver, which enabled the IR functionality on it. Its not merged, as enabling it seems to like to lock the unit up from time to time, and nobody (myself included) has had time to figure out why. In any case, it should be perfectly fine to nuke that, we need to fix lirc_zilog regardless.

Acked-by: Jarod Wilson <jarod-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

-- 
Jarod Wilson
jarod-ajLrJawYSntWk0Htik3J/w@public.gmane.org

Re: [PATCH 1/3] i2c: Delete unused adapter IDs

[Mauro Carvalho Chehab]

Em 05-11-2010 18:06, Jean Delvare escreveu:
> Delete unused I2C adapter IDs. Special cases are:
> 
> * I2C_HW_B_RIVA was still set in driver rivafb, however no other
>   driver is ever looking for this value, so we can safely remove it.
> * I2C_HW_B_HDPVR is used in staging driver lirc_zilog, however no
>   adapter ID is ever set to this value, so the code in question never
>   runs. As the code additionally expects that I2C_HW_B_HDPVR may not
>   be defined, we can delete it now and let the lirc_zilog driver
>   maintainer rewrite this piece of code.
> 
> Big thanks for Hans Verkuil for doing all the hard work :)
> 
> Signed-off-by: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>
> Cc: Hans Verkuil <hverkuil-qWit8jRvyhVmR6Xm/wNWPw@public.gmane.org>
> Cc: Jarod Wilson <jarod-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

Acked-by: Mauro Carvalho Chehab <mchehab-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> ---
>  drivers/video/riva/rivafb-i2c.c |    1 -
>  include/linux/i2c-id.h          |   22 ----------------------
>  2 files changed, 23 deletions(-)
> 
> --- linux-2.6.37-rc1.orig/include/linux/i2c-id.h	2010-11-05 13:55:17.000000000 +0100
> +++ linux-2.6.37-rc1/include/linux/i2c-id.h	2010-11-05 15:05:32.000000000 +0100
> @@ -32,28 +32,6 @@
>   */
>  
>  /* --- Bit algorithm adapters						*/
> -#define I2C_HW_B_BT848		0x010005 /* BT848 video boards */
> -#define I2C_HW_B_RIVA		0x010010 /* Riva based graphics cards */
> -#define I2C_HW_B_ZR36067	0x010019 /* Zoran-36057/36067 based boards */
>  #define I2C_HW_B_CX2388x	0x01001b /* connexant 2388x based tv cards */
> -#define I2C_HW_B_EM28XX		0x01001f /* em28xx video capture cards */
> -#define I2C_HW_B_CX2341X	0x010020 /* Conexant CX2341X MPEG encoder cards */
> -#define I2C_HW_B_CX23885	0x010022 /* conexant 23885 based tv cards (bus1) */
> -#define I2C_HW_B_AU0828		0x010023 /* auvitek au0828 usb bridge */
> -#define I2C_HW_B_CX231XX	0x010024 /* Conexant CX231XX USB based cards */
> -#define I2C_HW_B_HDPVR		0x010025 /* Hauppauge HD PVR */
> -
> -/* --- SGI adapters							*/
> -#define I2C_HW_SGI_VINO		0x160000
> -
> -/* --- SMBus only adapters						*/
> -#define I2C_HW_SMBUS_W9968CF	0x04000d
> -#define I2C_HW_SMBUS_OV511	0x04000e /* OV511(+) USB 1.1 webcam ICs */
> -#define I2C_HW_SMBUS_OV518	0x04000f /* OV518(+) USB 1.1 webcam ICs */
> -#define I2C_HW_SMBUS_CAFE	0x040012 /* Marvell 88ALP01 "CAFE" cam  */
> -
> -/* --- Miscellaneous adapters */
> -#define I2C_HW_SAA7146		0x060000 /* SAA7146 video decoder bus */
> -#define I2C_HW_SAA7134		0x090000 /* SAA7134 video decoder bus */
>  
>  #endif /* LINUX_I2C_ID_H */
> --- linux-2.6.37-rc1.orig/drivers/video/riva/rivafb-i2c.c	2010-11-05 13:55:17.000000000 +0100
> +++ linux-2.6.37-rc1/drivers/video/riva/rivafb-i2c.c	2010-11-05 13:55:19.000000000 +0100
> @@ -94,7 +94,6 @@ static int __devinit riva_setup_i2c_bus(
>  
>  	strcpy(chan->adapter.name, name);
>  	chan->adapter.owner		= THIS_MODULE;
> -	chan->adapter.id		= I2C_HW_B_RIVA;
>  	chan->adapter.class		= i2c_class;
>  	chan->adapter.algo_data		= &chan->algo;
>  	chan->adapter.dev.parent	= &chan->par->pdev->dev;
> 
> 

Re: [PATCH 1/3] i2c: Delete unused adapter IDs

[Hans Verkuil]

On Saturday, November 13, 2010 15:33:18 Mauro Carvalho Chehab wrote:
> Em 05-11-2010 18:06, Jean Delvare escreveu:
> > Delete unused I2C adapter IDs. Special cases are:
> > 
> > * I2C_HW_B_RIVA was still set in driver rivafb, however no other
> >   driver is ever looking for this value, so we can safely remove it.
> > * I2C_HW_B_HDPVR is used in staging driver lirc_zilog, however no
> >   adapter ID is ever set to this value, so the code in question never
> >   runs. As the code additionally expects that I2C_HW_B_HDPVR may not
> >   be defined, we can delete it now and let the lirc_zilog driver
> >   maintainer rewrite this piece of code.
> > 
> > Big thanks for Hans Verkuil for doing all the hard work :)
> > 
> > Signed-off-by: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>
> > Cc: Hans Verkuil <hverkuil-qWit8jRvyhVmR6Xm/wNWPw@public.gmane.org>
> > Cc: Jarod Wilson <jarod-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> 
> Acked-by: Mauro Carvalho Chehab <mchehab-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

Well, if everyone acks, then I'd better join :-)

Acked-by: Hans Verkuil <hverkuil-qWit8jRvyhVmR6Xm/wNWPw@public.gmane.org>

Regards,

	Hans

> > ---
> >  drivers/video/riva/rivafb-i2c.c |    1 -
> >  include/linux/i2c-id.h          |   22 ----------------------
> >  2 files changed, 23 deletions(-)
> > 
> > --- linux-2.6.37-rc1.orig/include/linux/i2c-id.h	2010-11-05 13:55:17.000000000 +0100
> > +++ linux-2.6.37-rc1/include/linux/i2c-id.h	2010-11-05 15:05:32.000000000 +0100
> > @@ -32,28 +32,6 @@
> >   */
> >  
> >  /* --- Bit algorithm adapters						*/
> > -#define I2C_HW_B_BT848		0x010005 /* BT848 video boards */
> > -#define I2C_HW_B_RIVA		0x010010 /* Riva based graphics cards */
> > -#define I2C_HW_B_ZR36067	0x010019 /* Zoran-36057/36067 based boards */
> >  #define I2C_HW_B_CX2388x	0x01001b /* connexant 2388x based tv cards */
> > -#define I2C_HW_B_EM28XX		0x01001f /* em28xx video capture cards */
> > -#define I2C_HW_B_CX2341X	0x010020 /* Conexant CX2341X MPEG encoder cards */
> > -#define I2C_HW_B_CX23885	0x010022 /* conexant 23885 based tv cards (bus1) */
> > -#define I2C_HW_B_AU0828		0x010023 /* auvitek au0828 usb bridge */
> > -#define I2C_HW_B_CX231XX	0x010024 /* Conexant CX231XX USB based cards */
> > -#define I2C_HW_B_HDPVR		0x010025 /* Hauppauge HD PVR */
> > -
> > -/* --- SGI adapters							*/
> > -#define I2C_HW_SGI_VINO		0x160000
> > -
> > -/* --- SMBus only adapters						*/
> > -#define I2C_HW_SMBUS_W9968CF	0x04000d
> > -#define I2C_HW_SMBUS_OV511	0x04000e /* OV511(+) USB 1.1 webcam ICs */
> > -#define I2C_HW_SMBUS_OV518	0x04000f /* OV518(+) USB 1.1 webcam ICs */
> > -#define I2C_HW_SMBUS_CAFE	0x040012 /* Marvell 88ALP01 "CAFE" cam  */
> > -
> > -/* --- Miscellaneous adapters */
> > -#define I2C_HW_SAA7146		0x060000 /* SAA7146 video decoder bus */
> > -#define I2C_HW_SAA7134		0x090000 /* SAA7134 video decoder bus */
> >  
> >  #endif /* LINUX_I2C_ID_H */
> > --- linux-2.6.37-rc1.orig/drivers/video/riva/rivafb-i2c.c	2010-11-05 13:55:17.000000000 +0100
> > +++ linux-2.6.37-rc1/drivers/video/riva/rivafb-i2c.c	2010-11-05 13:55:19.000000000 +0100
> > @@ -94,7 +94,6 @@ static int __devinit riva_setup_i2c_bus(
> >  
> >  	strcpy(chan->adapter.name, name);
> >  	chan->adapter.owner		= THIS_MODULE;
> > -	chan->adapter.id		= I2C_HW_B_RIVA;
> >  	chan->adapter.class		= i2c_class;
> >  	chan->adapter.algo_data		= &chan->algo;
> >  	chan->adapter.dev.parent	= &chan->par->pdev->dev;
> > 
> > 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

-- 
Hans Verkuil - video4linux developer - sponsored by Cisco