Commit 1745522ccbabd990bfc7511861aa9fa98287cba0
1 parent
e2ba42ed0f
Exists in
master
and in
20 other branches
i2c: Delete many unused adapter IDs
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Showing 38 changed files with 0 additions and 93 deletions Side-by-side Diff
- drivers/gpu/drm/i915/intel_i2c.c
- drivers/i2c/busses/i2c-acorn.c
- drivers/i2c/busses/i2c-ali1535.c
- drivers/i2c/busses/i2c-ali1563.c
- drivers/i2c/busses/i2c-ali15x3.c
- drivers/i2c/busses/i2c-amd756.c
- drivers/i2c/busses/i2c-amd8111.c
- drivers/i2c/busses/i2c-au1550.c
- drivers/i2c/busses/i2c-bfin-twi.c
- drivers/i2c/busses/i2c-elektor.c
- drivers/i2c/busses/i2c-hydra.c
- drivers/i2c/busses/i2c-i801.c
- drivers/i2c/busses/i2c-ibm_iic.c
- drivers/i2c/busses/i2c-iop3xx.c
- drivers/i2c/busses/i2c-ixp2000.c
- drivers/i2c/busses/i2c-mpc.c
- drivers/i2c/busses/i2c-mv64xxx.c
- drivers/i2c/busses/i2c-nforce2.c
- drivers/i2c/busses/i2c-parport-light.c
- drivers/i2c/busses/i2c-parport.c
- drivers/i2c/busses/i2c-pca-isa.c
- drivers/i2c/busses/i2c-piix4.c
- drivers/i2c/busses/i2c-sibyte.c
- drivers/i2c/busses/i2c-sis5595.c
- drivers/i2c/busses/i2c-sis630.c
- drivers/i2c/busses/i2c-sis96x.c
- drivers/i2c/busses/i2c-via.c
- drivers/i2c/busses/i2c-viapro.c
- drivers/i2c/busses/i2c-voodoo3.c
- drivers/i2c/busses/scx200_acb.c
- drivers/i2c/busses/scx200_i2c.c
- drivers/ieee1394/pcilynx.c
- drivers/video/aty/radeon_i2c.c
- drivers/video/i810/i810-i2c.c
- drivers/video/intelfb/intelfb_i2c.c
- drivers/video/nvidia/nv_i2c.c
- drivers/video/savage/savagefb-i2c.c
- include/linux/i2c-id.h
drivers/gpu/drm/i915/intel_i2c.c
... | ... | @@ -137,10 +137,6 @@ |
137 | 137 | chan->reg = reg; |
138 | 138 | snprintf(chan->adapter.name, I2C_NAME_SIZE, "intel drm %s", name); |
139 | 139 | chan->adapter.owner = THIS_MODULE; |
140 | -#ifndef I2C_HW_B_INTELFB | |
141 | -#define I2C_HW_B_INTELFB I2C_HW_B_I810 | |
142 | -#endif | |
143 | - chan->adapter.id = I2C_HW_B_INTELFB; | |
144 | 140 | chan->adapter.algo_data = &chan->algo; |
145 | 141 | chan->adapter.dev.parent = &dev->pdev->dev; |
146 | 142 | chan->algo.setsda = set_data; |
drivers/i2c/busses/i2c-acorn.c
drivers/i2c/busses/i2c-ali1535.c
drivers/i2c/busses/i2c-ali1563.c
drivers/i2c/busses/i2c-ali15x3.c
drivers/i2c/busses/i2c-amd756.c
drivers/i2c/busses/i2c-amd8111.c
... | ... | @@ -387,7 +387,6 @@ |
387 | 387 | smbus->adapter.owner = THIS_MODULE; |
388 | 388 | snprintf(smbus->adapter.name, sizeof(smbus->adapter.name), |
389 | 389 | "SMBus2 AMD8111 adapter at %04x", smbus->base); |
390 | - smbus->adapter.id = I2C_HW_SMBUS_AMD8111; | |
391 | 390 | smbus->adapter.class = I2C_CLASS_HWMON | I2C_CLASS_SPD; |
392 | 391 | smbus->adapter.algo = &smbus_algorithm; |
393 | 392 | smbus->adapter.algo_data = smbus; |
drivers/i2c/busses/i2c-au1550.c
drivers/i2c/busses/i2c-bfin-twi.c
... | ... | @@ -651,7 +651,6 @@ |
651 | 651 | iface->timeout_timer.data = (unsigned long)iface; |
652 | 652 | |
653 | 653 | p_adap = &iface->adap; |
654 | - p_adap->id = I2C_HW_BLACKFIN; | |
655 | 654 | p_adap->nr = pdev->id; |
656 | 655 | strlcpy(p_adap->name, pdev->name, sizeof(p_adap->name)); |
657 | 656 | p_adap->algo = &bfin_twi_algorithm; |
drivers/i2c/busses/i2c-elektor.c
drivers/i2c/busses/i2c-hydra.c
drivers/i2c/busses/i2c-i801.c
drivers/i2c/busses/i2c-ibm_iic.c
... | ... | @@ -746,7 +746,6 @@ |
746 | 746 | adap->dev.parent = &ofdev->dev; |
747 | 747 | strlcpy(adap->name, "IBM IIC", sizeof(adap->name)); |
748 | 748 | i2c_set_adapdata(adap, dev); |
749 | - adap->id = I2C_HW_OCP; | |
750 | 749 | adap->class = I2C_CLASS_HWMON | I2C_CLASS_SPD; |
751 | 750 | adap->algo = &iic_algo; |
752 | 751 | adap->timeout = 1; |
drivers/i2c/busses/i2c-iop3xx.c
... | ... | @@ -480,7 +480,6 @@ |
480 | 480 | } |
481 | 481 | |
482 | 482 | memcpy(new_adapter->name, pdev->name, strlen(pdev->name)); |
483 | - new_adapter->id = I2C_HW_IOP3XX; | |
484 | 483 | new_adapter->owner = THIS_MODULE; |
485 | 484 | new_adapter->class = I2C_CLASS_HWMON | I2C_CLASS_SPD; |
486 | 485 | new_adapter->dev.parent = &pdev->dev; |
drivers/i2c/busses/i2c-ixp2000.c
... | ... | @@ -116,7 +116,6 @@ |
116 | 116 | drv_data->algo_data.udelay = 6; |
117 | 117 | drv_data->algo_data.timeout = 100; |
118 | 118 | |
119 | - drv_data->adapter.id = I2C_HW_B_IXP2000, | |
120 | 119 | strlcpy(drv_data->adapter.name, plat_dev->dev.driver->name, |
121 | 120 | sizeof(drv_data->adapter.name)); |
122 | 121 | drv_data->adapter.algo_data = &drv_data->algo_data, |
drivers/i2c/busses/i2c-mpc.c
drivers/i2c/busses/i2c-mv64xxx.c
... | ... | @@ -527,7 +527,6 @@ |
527 | 527 | goto exit_unmap_regs; |
528 | 528 | } |
529 | 529 | drv_data->adapter.dev.parent = &pd->dev; |
530 | - drv_data->adapter.id = I2C_HW_MV64XXX; | |
531 | 530 | drv_data->adapter.algo = &mv64xxx_i2c_algo; |
532 | 531 | drv_data->adapter.owner = THIS_MODULE; |
533 | 532 | drv_data->adapter.class = I2C_CLASS_HWMON | I2C_CLASS_SPD; |
drivers/i2c/busses/i2c-nforce2.c
... | ... | @@ -355,7 +355,6 @@ |
355 | 355 | return -EBUSY; |
356 | 356 | } |
357 | 357 | smbus->adapter.owner = THIS_MODULE; |
358 | - smbus->adapter.id = I2C_HW_SMBUS_NFORCE2; | |
359 | 358 | smbus->adapter.class = I2C_CLASS_HWMON | I2C_CLASS_SPD; |
360 | 359 | smbus->adapter.algo = &smbus_algorithm; |
361 | 360 | smbus->adapter.algo_data = smbus; |
drivers/i2c/busses/i2c-parport-light.c
drivers/i2c/busses/i2c-parport.c
... | ... | @@ -164,7 +164,6 @@ |
164 | 164 | /* Fill the rest of the structure */ |
165 | 165 | adapter->adapter.owner = THIS_MODULE; |
166 | 166 | adapter->adapter.class = I2C_CLASS_HWMON; |
167 | - adapter->adapter.id = I2C_HW_B_LP; | |
168 | 167 | strlcpy(adapter->adapter.name, "Parallel port adapter", |
169 | 168 | sizeof(adapter->adapter.name)); |
170 | 169 | adapter->algo_data = parport_algo_data; |
drivers/i2c/busses/i2c-pca-isa.c
drivers/i2c/busses/i2c-piix4.c
drivers/i2c/busses/i2c-sibyte.c
... | ... | @@ -155,7 +155,6 @@ |
155 | 155 | static struct i2c_adapter sibyte_board_adapter[2] = { |
156 | 156 | { |
157 | 157 | .owner = THIS_MODULE, |
158 | - .id = I2C_HW_SIBYTE, | |
159 | 158 | .class = I2C_CLASS_HWMON | I2C_CLASS_SPD, |
160 | 159 | .algo = NULL, |
161 | 160 | .algo_data = &sibyte_board_data[0], |
... | ... | @@ -164,7 +163,6 @@ |
164 | 163 | }, |
165 | 164 | { |
166 | 165 | .owner = THIS_MODULE, |
167 | - .id = I2C_HW_SIBYTE, | |
168 | 166 | .class = I2C_CLASS_HWMON | I2C_CLASS_SPD, |
169 | 167 | .algo = NULL, |
170 | 168 | .algo_data = &sibyte_board_data[1], |
drivers/i2c/busses/i2c-sis5595.c
drivers/i2c/busses/i2c-sis630.c
drivers/i2c/busses/i2c-sis96x.c
drivers/i2c/busses/i2c-via.c
drivers/i2c/busses/i2c-viapro.c
drivers/i2c/busses/i2c-voodoo3.c
... | ... | @@ -163,7 +163,6 @@ |
163 | 163 | |
164 | 164 | static struct i2c_adapter voodoo3_i2c_adapter = { |
165 | 165 | .owner = THIS_MODULE, |
166 | - .id = I2C_HW_B_VOO, | |
167 | 166 | .class = I2C_CLASS_TV_ANALOG, |
168 | 167 | .name = "I2C Voodoo3/Banshee adapter", |
169 | 168 | .algo_data = &voo_i2c_bit_data, |
... | ... | @@ -180,7 +179,6 @@ |
180 | 179 | |
181 | 180 | static struct i2c_adapter voodoo3_ddc_adapter = { |
182 | 181 | .owner = THIS_MODULE, |
183 | - .id = I2C_HW_B_VOO, | |
184 | 182 | .class = I2C_CLASS_DDC, |
185 | 183 | .name = "DDC Voodoo3/Banshee adapter", |
186 | 184 | .algo_data = &voo_ddc_bit_data, |
drivers/i2c/busses/scx200_acb.c
... | ... | @@ -440,7 +440,6 @@ |
440 | 440 | i2c_set_adapdata(adapter, iface); |
441 | 441 | snprintf(adapter->name, sizeof(adapter->name), "%s ACB%d", text, index); |
442 | 442 | adapter->owner = THIS_MODULE; |
443 | - adapter->id = I2C_HW_SMBUS_SCX200; | |
444 | 443 | adapter->algo = &scx200_acb_algorithm; |
445 | 444 | adapter->class = I2C_CLASS_HWMON | I2C_CLASS_SPD; |
446 | 445 | adapter->dev.parent = dev; |
drivers/i2c/busses/scx200_i2c.c
drivers/ieee1394/pcilynx.c
... | ... | @@ -1419,7 +1419,6 @@ |
1419 | 1419 | i2c_ad = kzalloc(sizeof(*i2c_ad), GFP_KERNEL); |
1420 | 1420 | if (!i2c_ad) FAIL("failed to allocate I2C adapter memory"); |
1421 | 1421 | |
1422 | - i2c_ad->id = I2C_HW_B_PCILYNX; | |
1423 | 1422 | strlcpy(i2c_ad->name, "PCILynx I2C", sizeof(i2c_ad->name)); |
1424 | 1423 | i2c_adapter_data = bit_data; |
1425 | 1424 | i2c_ad->algo_data = &i2c_adapter_data; |
drivers/video/aty/radeon_i2c.c
... | ... | @@ -72,7 +72,6 @@ |
72 | 72 | snprintf(chan->adapter.name, sizeof(chan->adapter.name), |
73 | 73 | "radeonfb %s", name); |
74 | 74 | chan->adapter.owner = THIS_MODULE; |
75 | - chan->adapter.id = I2C_HW_B_RADEON; | |
76 | 75 | chan->adapter.algo_data = &chan->algo; |
77 | 76 | chan->adapter.dev.parent = &chan->rinfo->pdev->dev; |
78 | 77 | chan->algo.setsda = radeon_gpio_setsda; |
drivers/video/i810/i810-i2c.c
... | ... | @@ -90,7 +90,6 @@ |
90 | 90 | chan->adapter.owner = THIS_MODULE; |
91 | 91 | chan->adapter.algo_data = &chan->algo; |
92 | 92 | chan->adapter.dev.parent = &chan->par->dev->dev; |
93 | - chan->adapter.id = I2C_HW_B_I810; | |
94 | 93 | chan->algo.setsda = i810i2c_setsda; |
95 | 94 | chan->algo.setscl = i810i2c_setscl; |
96 | 95 | chan->algo.getsda = i810i2c_getsda; |
drivers/video/intelfb/intelfb_i2c.c
... | ... | @@ -111,7 +111,6 @@ |
111 | 111 | "intelfb %s", name); |
112 | 112 | chan->adapter.class = class; |
113 | 113 | chan->adapter.owner = THIS_MODULE; |
114 | - chan->adapter.id = I2C_HW_B_INTELFB; | |
115 | 114 | chan->adapter.algo_data = &chan->algo; |
116 | 115 | chan->adapter.dev.parent = &chan->dinfo->pdev->dev; |
117 | 116 | chan->algo.setsda = intelfb_gpio_setsda; |
drivers/video/nvidia/nv_i2c.c
drivers/video/savage/savagefb-i2c.c
... | ... | @@ -137,7 +137,6 @@ |
137 | 137 | if (chan->par) { |
138 | 138 | strcpy(chan->adapter.name, name); |
139 | 139 | chan->adapter.owner = THIS_MODULE; |
140 | - chan->adapter.id = I2C_HW_B_SAVAGE; | |
141 | 140 | chan->adapter.algo_data = &chan->algo; |
142 | 141 | chan->adapter.dev.parent = &chan->par->pcidev->dev; |
143 | 142 | chan->algo.udelay = 10; |
include/linux/i2c-id.h
... | ... | @@ -79,74 +79,23 @@ |
79 | 79 | */ |
80 | 80 | |
81 | 81 | /* --- Bit algorithm adapters */ |
82 | -#define I2C_HW_B_LP 0x010000 /* Parallel port Philips style */ | |
83 | 82 | #define I2C_HW_B_BT848 0x010005 /* BT848 video boards */ |
84 | -#define I2C_HW_B_VIA 0x010007 /* Via vt82c586b */ | |
85 | -#define I2C_HW_B_HYDRA 0x010008 /* Apple Hydra Mac I/O */ | |
86 | -#define I2C_HW_B_I810 0x01000a /* Intel I810 */ | |
87 | -#define I2C_HW_B_VOO 0x01000b /* 3dfx Voodoo 3 / Banshee */ | |
88 | -#define I2C_HW_B_SCX200 0x01000e /* Nat'l Semi SCx200 I2C */ | |
89 | 83 | #define I2C_HW_B_RIVA 0x010010 /* Riva based graphics cards */ |
90 | -#define I2C_HW_B_IOC 0x010011 /* IOC bit-wiggling */ | |
91 | -#define I2C_HW_B_IXP2000 0x010016 /* GPIO on IXP2000 systems */ | |
92 | 84 | #define I2C_HW_B_ZR36067 0x010019 /* Zoran-36057/36067 based boards */ |
93 | -#define I2C_HW_B_PCILYNX 0x01001a /* TI PCILynx I2C adapter */ | |
94 | 85 | #define I2C_HW_B_CX2388x 0x01001b /* connexant 2388x based tv cards */ |
95 | -#define I2C_HW_B_NVIDIA 0x01001c /* nvidia framebuffer driver */ | |
96 | -#define I2C_HW_B_SAVAGE 0x01001d /* savage framebuffer driver */ | |
97 | -#define I2C_HW_B_RADEON 0x01001e /* radeon framebuffer driver */ | |
98 | 86 | #define I2C_HW_B_EM28XX 0x01001f /* em28xx video capture cards */ |
99 | 87 | #define I2C_HW_B_CX2341X 0x010020 /* Conexant CX2341X MPEG encoder cards */ |
100 | -#define I2C_HW_B_INTELFB 0x010021 /* intel framebuffer driver */ | |
101 | 88 | #define I2C_HW_B_CX23885 0x010022 /* conexant 23885 based tv cards (bus1) */ |
102 | 89 | #define I2C_HW_B_AU0828 0x010023 /* auvitek au0828 usb bridge */ |
103 | 90 | |
104 | -/* --- PCF 8584 based algorithms */ | |
105 | -#define I2C_HW_P_ELEK 0x020002 /* Elektor ISA Bus inteface card */ | |
106 | - | |
107 | -/* --- PCA 9564 based algorithms */ | |
108 | -#define I2C_HW_A_ISA 0x1a0000 /* generic ISA Bus interface card */ | |
109 | - | |
110 | -/* --- PowerPC on-chip adapters */ | |
111 | -#define I2C_HW_OCP 0x120000 /* IBM on-chip I2C adapter */ | |
112 | - | |
113 | -/* --- Broadcom SiByte adapters */ | |
114 | -#define I2C_HW_SIBYTE 0x150000 | |
115 | - | |
116 | 91 | /* --- SGI adapters */ |
117 | 92 | #define I2C_HW_SGI_VINO 0x160000 |
118 | 93 | |
119 | -/* --- XSCALE on-chip adapters */ | |
120 | -#define I2C_HW_IOP3XX 0x140000 | |
121 | - | |
122 | -/* --- Au1550 PSC adapters adapters */ | |
123 | -#define I2C_HW_AU1550_PSC 0x1b0000 | |
124 | - | |
125 | 94 | /* --- SMBus only adapters */ |
126 | -#define I2C_HW_SMBUS_PIIX4 0x040000 | |
127 | -#define I2C_HW_SMBUS_ALI15X3 0x040001 | |
128 | -#define I2C_HW_SMBUS_VIA2 0x040002 | |
129 | -#define I2C_HW_SMBUS_I801 0x040004 | |
130 | -#define I2C_HW_SMBUS_AMD756 0x040005 | |
131 | -#define I2C_HW_SMBUS_SIS5595 0x040006 | |
132 | -#define I2C_HW_SMBUS_ALI1535 0x040007 | |
133 | -#define I2C_HW_SMBUS_SIS630 0x040008 | |
134 | -#define I2C_HW_SMBUS_SIS96X 0x040009 | |
135 | -#define I2C_HW_SMBUS_AMD8111 0x04000a | |
136 | -#define I2C_HW_SMBUS_SCX200 0x04000b | |
137 | -#define I2C_HW_SMBUS_NFORCE2 0x04000c | |
138 | 95 | #define I2C_HW_SMBUS_W9968CF 0x04000d |
139 | 96 | #define I2C_HW_SMBUS_OV511 0x04000e /* OV511(+) USB 1.1 webcam ICs */ |
140 | 97 | #define I2C_HW_SMBUS_OV518 0x04000f /* OV518(+) USB 1.1 webcam ICs */ |
141 | 98 | #define I2C_HW_SMBUS_CAFE 0x040012 /* Marvell 88ALP01 "CAFE" cam */ |
142 | -#define I2C_HW_SMBUS_ALI1563 0x040013 | |
143 | - | |
144 | -/* --- MCP107 adapter */ | |
145 | -#define I2C_HW_MPC107 0x0d0000 | |
146 | - | |
147 | -/* --- Embedded adapters */ | |
148 | -#define I2C_HW_MV64XXX 0x190000 | |
149 | -#define I2C_HW_BLACKFIN 0x190001 /* ADI Blackfin I2C TWI driver */ | |
150 | 99 | |
151 | 100 | /* --- Miscellaneous adapters */ |
152 | 101 | #define I2C_HW_SAA7146 0x060000 /* SAA7146 video decoder bus */ |