i2c: Delete unused adapter IDs

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>
Acked-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>

authored by Jean Delvare and committed by Jean Delvare dfdee5f0 dc6641be

-23
-1
drivers/video/riva/rivafb-i2c.c
··· 94 94 95 95 strcpy(chan->adapter.name, name); 96 96 chan->adapter.owner = THIS_MODULE; 97 - chan->adapter.id = I2C_HW_B_RIVA; 98 97 chan->adapter.class = i2c_class; 99 98 chan->adapter.algo_data = &chan->algo; 100 99 chan->adapter.dev.parent = &chan->par->pdev->dev;
-22
include/linux/i2c-id.h
··· 32 32 */ 33 33 34 34 /* --- Bit algorithm adapters */ 35 - #define I2C_HW_B_BT848 0x010005 /* BT848 video boards */ 36 - #define I2C_HW_B_RIVA 0x010010 /* Riva based graphics cards */ 37 - #define I2C_HW_B_ZR36067 0x010019 /* Zoran-36057/36067 based boards */ 38 35 #define I2C_HW_B_CX2388x 0x01001b /* connexant 2388x based tv cards */ 39 - #define I2C_HW_B_EM28XX 0x01001f /* em28xx video capture cards */ 40 - #define I2C_HW_B_CX2341X 0x010020 /* Conexant CX2341X MPEG encoder cards */ 41 - #define I2C_HW_B_CX23885 0x010022 /* conexant 23885 based tv cards (bus1) */ 42 - #define I2C_HW_B_AU0828 0x010023 /* auvitek au0828 usb bridge */ 43 - #define I2C_HW_B_CX231XX 0x010024 /* Conexant CX231XX USB based cards */ 44 - #define I2C_HW_B_HDPVR 0x010025 /* Hauppauge HD PVR */ 45 - 46 - /* --- SGI adapters */ 47 - #define I2C_HW_SGI_VINO 0x160000 48 - 49 - /* --- SMBus only adapters */ 50 - #define I2C_HW_SMBUS_W9968CF 0x04000d 51 - #define I2C_HW_SMBUS_OV511 0x04000e /* OV511(+) USB 1.1 webcam ICs */ 52 - #define I2C_HW_SMBUS_OV518 0x04000f /* OV518(+) USB 1.1 webcam ICs */ 53 - #define I2C_HW_SMBUS_CAFE 0x040012 /* Marvell 88ALP01 "CAFE" cam */ 54 - 55 - /* --- Miscellaneous adapters */ 56 - #define I2C_HW_SAA7146 0x060000 /* SAA7146 video decoder bus */ 57 - #define I2C_HW_SAA7134 0x090000 /* SAA7134 video decoder bus */ 58 36 59 37 #endif /* LINUX_I2C_ID_H */