i2c: Delete many unused adapter IDs
Subsystems (10)
PATCH 1/1 i2c: Delete many unused adapter IDs
Signed-off-by Jean Delvare <[email protected]>
--- drivers/gpu/drm/i915/intel_i2c.c | 4 -- drivers/i2c/busses/i2c-acorn.c | 1 drivers/i2c/busses/i2c-ali1535.c | 1 drivers/i2c/busses/i2c-ali1563.c | 1 drivers/i2c/busses/i2c-ali15x3.c | 1 drivers/i2c/busses/i2c-amd756.c | 1 drivers/i2c/busses/i2c-amd8111.c | 1 drivers/i2c/busses/i2c-au1550.c | 1 drivers/i2c/busses/i2c-bfin-twi.c | 1 drivers/i2c/busses/i2c-elektor.c | 1 drivers/i2c/busses/i2c-hydra.c | 1 drivers/i2c/busses/i2c-i801.c | 1 drivers/i2c/busses/i2c-ibm_iic.c | 1 drivers/i2c/busses/i2c-iop3xx.c | 1 drivers/i2c/busses/i2c-ixp2000.c | 1 drivers/i2c/busses/i2c-mpc.c | 1 drivers/i2c/busses/i2c-mv64xxx.c | 1 drivers/i2c/busses/i2c-nforce2.c | 1 drivers/i2c/busses/i2c-parport-light.c | 1 drivers/i2c/busses/i2c-parport.c | 1 drivers/i2c/busses/i2c-pca-isa.c | 1 drivers/i2c/busses/i2c-piix4.c | 1 drivers/i2c/busses/i2c-sibyte.c | 2 - drivers/i2c/busses/i2c-sis5595.c | 1 drivers/i2c/busses/i2c-sis630.c | 1 drivers/i2c/busses/i2c-sis96x.c | 1 drivers/i2c/busses/i2c-via.c | 1 drivers/i2c/busses/i2c-viapro.c | 1 drivers/i2c/busses/i2c-voodoo3.c | 2 - drivers/i2c/busses/scx200_acb.c | 1 drivers/i2c/busses/scx200_i2c.c | 1 drivers/ieee1394/pcilynx.c | 1 drivers/video/aty/radeon_i2c.c | 1 drivers/video/i810/i810-i2c.c | 1 drivers/video/intelfb/intelfb_i2c.c | 1 drivers/video/nvidia/nv_i2c.c | 1 drivers/video/savage/savagefb-i2c.c | 1 include/linux/i2c-id.h | 51 -------------------------------- 38 files changed, 93 deletions(-)
drivers/gpu/drm/i915/intel_i2c.c +0 -4
@@ -137,10 +137,6 @@ struct intel_i2c_chan *intel_i2c_create( chan->reg = reg;snprintf (chan->adapter.name,I2C_NAME_SIZE ,"intel drm %s" , name); chan->adapter.owner =THIS_MODULE ; -#ifndef I2C_HW_B_INTELFB -#define I2C_HW_B_INTELFB I2C_HW_B_I810 -#endif - chan->adapter.id =I2C_HW_B_INTELFB ; chan->adapter.algo_data = &chan->algo; chan->adapter.dev.parent = &dev->pdev->dev; chan->algo.setsda = set_data;
drivers/i2c/busses/i2c-acorn.c +0 -1
@@ -83,7 +83,6 @@ static struct i2c_algo_bit_data ioc_data };static struct i2c_adapter ioc_ops = { - .id =I2C_HW_B_IOC , .algo_data = &ioc_data, };
drivers/i2c/busses/i2c-ali1535.c +0 -1
@@ -476,7 +476,6 @@ static const struct i2c_algorithm smbus_static struct i2c_adapter ali1535_adapter = { .owner =THIS_MODULE , - .id =I2C_HW_SMBUS_ALI1535 , .class =I2C_CLASS_HWMON |I2C_CLASS_SPD , .algo = &smbus_algorithm, };
drivers/i2c/busses/i2c-ali1563.c +0 -1
@@ -386,7 +386,6 @@ static const struct i2c_algorithm ali156static struct i2c_adapter ali1563_adapter = { .owner =THIS_MODULE , - .id =I2C_HW_SMBUS_ALI1563 , .class =I2C_CLASS_HWMON |I2C_CLASS_SPD , .algo = &ali1563_algorithm, };
drivers/i2c/busses/i2c-ali15x3.c +0 -1
@@ -473,7 +473,6 @@ static const struct i2c_algorithm smbus_static struct i2c_adapter ali15x3_adapter = { .owner =THIS_MODULE , - .id =I2C_HW_SMBUS_ALI15X3 , .class =I2C_CLASS_HWMON |I2C_CLASS_SPD , .algo = &smbus_algorithm, };
drivers/i2c/busses/i2c-amd756.c +0 -1
@@ -298,7 +298,6 @@ static const struct i2c_algorithm smbus_struct i2c_adapter amd756_smbus = { .owner =THIS_MODULE , - .id =I2C_HW_SMBUS_AMD756 , .class =I2C_CLASS_HWMON |I2C_CLASS_SPD , .algo = &smbus_algorithm, };
drivers/i2c/busses/i2c-amd8111.c +0 -1
@@ -387,7 +387,6 @@ static int __devinit amd8111_probe(struc smbus->adapter.owner =THIS_MODULE ;snprintf (smbus->adapter.name,sizeof (smbus->adapter.name),"SMBus2 AMD8111 adapter at %04x" , smbus->base); - smbus->adapter.id =I2C_HW_SMBUS_AMD8111 ; smbus->adapter.class =I2C_CLASS_HWMON |I2C_CLASS_SPD ; smbus->adapter.algo = &smbus_algorithm; smbus->adapter.algo_data = smbus;
drivers/i2c/busses/i2c-au1550.c +0 -1
@@ -400,7 +400,6 @@ i2c_au1550_probe(struct platform_device priv->xfer_timeout =200 ; priv->ack_timeout =200 ; - priv->adap.id =I2C_HW_AU1550_PSC ; priv->adap.nr = pdev->id; priv->adap.algo = &au1550_algo; priv->adap.algo_data = priv;
drivers/i2c/busses/i2c-bfin-twi.c +0 -1
@@ -651,7 +651,6 @@ static int i2c_bfin_twi_probe(struct pla iface->timeout_timer.data = (unsigned long )iface; p_adap = &iface->adap; - p_adap->id =I2C_HW_BLACKFIN ; p_adap->nr = pdev->id;strlcpy (p_adap->name, pdev->name,sizeof (p_adap->name)); p_adap->algo = &bfin_twi_algorithm;
drivers/i2c/busses/i2c-elektor.c +0 -1
@@ -202,7 +202,6 @@ static struct i2c_algo_pcf_data pcf_isa_static struct i2c_adapter pcf_isa_ops = { .owner =THIS_MODULE , .class =I2C_CLASS_HWMON |I2C_CLASS_SPD , - .id =I2C_HW_P_ELEK , .algo_data = &pcf_isa_data, .name ="i2c-elektor" , };
drivers/i2c/busses/i2c-hydra.c +0 -1
@@ -102,7 +102,6 @@ static struct i2c_algo_bit_data hydra_bistatic struct i2c_adapter hydra_adap = { .owner =THIS_MODULE , .name ="Hydra i2c" , - .id =I2C_HW_B_HYDRA , .algo_data = &hydra_bit_data, };
drivers/i2c/busses/i2c-i801.c +0 -1
@@ -556,7 +556,6 @@ static const struct i2c_algorithm smbus_static struct i2c_adapter i801_adapter = { .owner =THIS_MODULE , - .id =I2C_HW_SMBUS_I801 , .class =I2C_CLASS_HWMON |I2C_CLASS_SPD , .algo = &smbus_algorithm, };
drivers/i2c/busses/i2c-ibm_iic.c +0 -1
@@ -746,7 +746,6 @@ static int __devinit iic_probe(struct of adap->dev.parent = &ofdev->dev;strlcpy (adap->name,"IBM IIC" ,sizeof (adap->name));i2c_set_adapdata (adap, dev); - adap->id =I2C_HW_OCP ; adap->class =I2C_CLASS_HWMON |I2C_CLASS_SPD ; adap->algo = &iic_algo; adap->timeout =1 ;
drivers/i2c/busses/i2c-iop3xx.c +0 -1
@@ -480,7 +480,6 @@ iop3xx_i2c_probe(struct platform_device }memcpy (new_adapter->name, pdev->name,strlen (pdev->name)); - new_adapter->id =I2C_HW_IOP3XX ; new_adapter->owner =THIS_MODULE ; new_adapter->class =I2C_CLASS_HWMON |I2C_CLASS_SPD ; new_adapter->dev.parent = &pdev->dev;
drivers/i2c/busses/i2c-ixp2000.c +0 -1
@@ -116,7 +116,6 @@ static int ixp2000_i2c_probe(struct plat drv_data->algo_data.udelay =6 ; drv_data->algo_data.timeout =100 ; - drv_data->adapter.id =I2C_HW_B_IXP2000 ,strlcpy (drv_data->adapter.name, plat_dev->dev.driver->name,sizeof (drv_data->adapter.name)); drv_data->adapter.algo_data = &drv_data->algo_data,
drivers/i2c/busses/i2c-mpc.c +0 -1
@@ -310,7 +310,6 @@ static const struct i2c_algorithm mpc_alstatic struct i2c_adapter mpc_ops = { .owner =THIS_MODULE , .name ="MPC adapter" , - .id =I2C_HW_MPC107 , .algo = &mpc_algo, .timeout =1 , };
drivers/i2c/busses/i2c-mv64xxx.c +0 -1
@@ -527,7 +527,6 @@ mv64xxx_i2c_probe(struct platform_device goto exit_unmap_regs; } drv_data->adapter.dev.parent = &pd->dev; - drv_data->adapter.id =I2C_HW_MV64XXX ; drv_data->adapter.algo = &mv64xxx_i2c_algo; drv_data->adapter.owner =THIS_MODULE ; drv_data->adapter.class =I2C_CLASS_HWMON |I2C_CLASS_SPD ;
drivers/i2c/busses/i2c-nforce2.c +0 -1
@@ -355,7 +355,6 @@ static int __devinit nforce2_probe_smb (return -EBUSY ; } smbus->adapter.owner =THIS_MODULE ; - smbus->adapter.id =I2C_HW_SMBUS_NFORCE2 ; smbus->adapter.class =I2C_CLASS_HWMON |I2C_CLASS_SPD ; smbus->adapter.algo = &smbus_algorithm; smbus->adapter.algo_data = smbus;
drivers/i2c/busses/i2c-parport-light.c +0 -1
@@ -115,7 +115,6 @@ static struct i2c_algo_bit_data parport_static struct i2c_adapter parport_adapter = { .owner =THIS_MODULE , .class =I2C_CLASS_HWMON , - .id =I2C_HW_B_LP , .algo_data = &parport_algo_data, .name ="Parallel port adapter (light)" , };
drivers/i2c/busses/i2c-parport.c +0 -1
@@ -164,7 +164,6 @@ static void i2c_parport_attach (struct p/* Fill the rest of the structure */ adapter->adapter.owner =THIS_MODULE ; adapter->adapter.class =I2C_CLASS_HWMON ; - adapter->adapter.id =I2C_HW_B_LP ;strlcpy (adapter->adapter.name,"Parallel port adapter" ,sizeof (adapter->adapter.name)); adapter->algo_data = parport_algo_data;
drivers/i2c/busses/i2c-pca-isa.c +0 -1
@@ -101,7 +101,6 @@ static struct i2c_algo_pca_data pca_isa_static struct i2c_adapter pca_isa_ops = { .owner =THIS_MODULE , - .id =I2C_HW_A_ISA , .algo_data = &pca_isa_data, .name ="PCA9564 ISA Adapter" , .timeout =100 ,
drivers/i2c/busses/i2c-piix4.c +0 -1
@@ -403,7 +403,6 @@ static const struct i2c_algorithm smbus_static struct i2c_adapter piix4_adapter = { .owner =THIS_MODULE , - .id =I2C_HW_SMBUS_PIIX4 , .class =I2C_CLASS_HWMON |I2C_CLASS_SPD , .algo = &smbus_algorithm, };
drivers/i2c/busses/i2c-sibyte.c +0 -2
@@ -155,7 +155,6 @@ static struct i2c_algo_sibyte_data sibytstatic struct i2c_adapter sibyte_board_adapter[2 ] = { { .owner =THIS_MODULE , - .id =I2C_HW_SIBYTE , .class =I2C_CLASS_HWMON |I2C_CLASS_SPD , .algo =NULL , .algo_data = &sibyte_board_data[0 ],
@@ -164,7 +163,6 @@ static struct i2c_adapter sibyte_board_a }, { .owner = THIS_MODULE, - .id = I2C_HW_SIBYTE, .class = I2C_CLASS_HWMON | I2C_CLASS_SPD, .algo = NULL, .algo_data = &sibyte_board_data[1],
drivers/i2c/busses/i2c-sis5595.c +0 -1
@@ -365,7 +365,6 @@ static const struct i2c_algorithm smbus_static struct i2c_adapter sis5595_adapter = { .owner =THIS_MODULE , - .id =I2C_HW_SMBUS_SIS5595 , .class =I2C_CLASS_HWMON |I2C_CLASS_SPD , .algo = &smbus_algorithm, };
drivers/i2c/busses/i2c-sis630.c +0 -1
@@ -464,7 +464,6 @@ static const struct i2c_algorithm smbus_static struct i2c_adapter sis630_adapter = { .owner =THIS_MODULE , - .id =I2C_HW_SMBUS_SIS630 , .class =I2C_CLASS_HWMON |I2C_CLASS_SPD , .algo = &smbus_algorithm, };
drivers/i2c/busses/i2c-sis96x.c +0 -1
@@ -241,7 +241,6 @@ static const struct i2c_algorithm smbus_static struct i2c_adapter sis96x_adapter = { .owner =THIS_MODULE , - .id =I2C_HW_SMBUS_SIS96X , .class =I2C_CLASS_HWMON |I2C_CLASS_SPD , .algo = &smbus_algorithm, };
drivers/i2c/busses/i2c-via.c +0 -1
@@ -83,7 +83,6 @@ static struct i2c_algo_bit_data bit_datastatic struct i2c_adapter vt586b_adapter = { .owner =THIS_MODULE , - .id =I2C_HW_B_VIA , .class =I2C_CLASS_HWMON |I2C_CLASS_SPD , .name ="VIA i2c" , .algo_data = &bit_data,
drivers/i2c/busses/i2c-viapro.c +0 -1
@@ -321,7 +321,6 @@ static const struct i2c_algorithm smbus_static struct i2c_adapter vt596_adapter = { .owner =THIS_MODULE , - .id =I2C_HW_SMBUS_VIA2 , .class =I2C_CLASS_HWMON |I2C_CLASS_SPD , .algo = &smbus_algorithm, };
drivers/i2c/busses/i2c-voodoo3.c +0 -2
@@ -163,7 +163,6 @@ static struct i2c_algo_bit_data voo_i2c_static struct i2c_adapter voodoo3_i2c_adapter = { .owner =THIS_MODULE , - .id =I2C_HW_B_VOO , .class =I2C_CLASS_TV_ANALOG , .name ="I2C Voodoo3/Banshee adapter" , .algo_data = &voo_i2c_bit_data,
@@ -180,7 +179,6 @@ static struct i2c_algo_bit_data voo_ddc_static struct i2c_adapter voodoo3_ddc_adapter = { .owner =THIS_MODULE , - .id =I2C_HW_B_VOO , .class =I2C_CLASS_DDC , .name ="DDC Voodoo3/Banshee adapter" , .algo_data = &voo_ddc_bit_data,
drivers/i2c/busses/scx200_acb.c +0 -1
@@ -440,7 +440,6 @@ static __init struct scx200_acb_iface *si2c_set_adapdata (adapter, iface);snprintf (adapter->name,sizeof (adapter->name),"%s ACB%d" , text, index); adapter->owner =THIS_MODULE ; - adapter->id =I2C_HW_SMBUS_SCX200 ; adapter->algo = &scx200_acb_algorithm; adapter->class =I2C_CLASS_HWMON |I2C_CLASS_SPD ; adapter->dev.parent = dev;
drivers/i2c/busses/scx200_i2c.c +0 -1
@@ -82,7 +82,6 @@ static struct i2c_algo_bit_data scx200_istatic struct i2c_adapter scx200_i2c_ops = { .owner =THIS_MODULE , .class =I2C_CLASS_HWMON |I2C_CLASS_SPD , - .id =I2C_HW_B_SCX200 , .algo_data = &scx200_i2c_data, .name ="NatSemi SCx200 I2C" , };
drivers/ieee1394/pcilynx.c +0 -1
@@ -1419,7 +1419,6 @@ static int __devinit add_card(struct pci i2c_ad =kzalloc (sizeof (*i2c_ad),GFP_KERNEL );if (!i2c_ad)FAIL ("failed to allocate I2C adapter memory" ); - i2c_ad->id =I2C_HW_B_PCILYNX ;strlcpy (i2c_ad->name,"PCILynx I2C" ,sizeof (i2c_ad->name)); i2c_adapter_data = bit_data; i2c_ad->algo_data = &i2c_adapter_data;
drivers/video/aty/radeon_i2c.c +0 -1
@@ -72,7 +72,6 @@ static int radeon_setup_i2c_bus(struct rsnprintf (chan->adapter.name,sizeof (chan->adapter.name),"radeonfb %s" , name); chan->adapter.owner =THIS_MODULE ; - chan->adapter.id =I2C_HW_B_RADEON ; chan->adapter.algo_data = &chan->algo; chan->adapter.dev.parent = &chan->rinfo->pdev->dev; chan->algo.setsda = radeon_gpio_setsda;
drivers/video/i810/i810-i2c.c +0 -1
@@ -90,7 +90,6 @@ static int i810_setup_i2c_bus(struct i81 chan->adapter.owner =THIS_MODULE ; chan->adapter.algo_data = &chan->algo; chan->adapter.dev.parent = &chan->par->dev->dev; - chan->adapter.id =I2C_HW_B_I810 ; chan->algo.setsda = i810i2c_setsda; chan->algo.setscl = i810i2c_setscl; chan->algo.getsda = i810i2c_getsda;
drivers/video/intelfb/intelfb_i2c.c +0 -1
@@ -111,7 +111,6 @@ static int intelfb_setup_i2c_bus(struct "intelfb %s", name); chan->adapter.class = class; chan->adapter.owner =THIS_MODULE ; - chan->adapter.id =I2C_HW_B_INTELFB ; chan->adapter.algo_data = &chan->algo; chan->adapter.dev.parent = &chan->dinfo->pdev->dev; chan->algo.setsda = intelfb_gpio_setsda;
drivers/video/nvidia/nv_i2c.c +0 -1
@@ -87,7 +87,6 @@ static int nvidia_setup_i2c_bus(struct nstrcpy (chan->adapter.name, name); chan->adapter.owner =THIS_MODULE ; - chan->adapter.id =I2C_HW_B_NVIDIA ; chan->adapter.class = i2c_class; chan->adapter.algo_data = &chan->algo; chan->adapter.dev.parent = &chan->par->pci_dev->dev;
drivers/video/savage/savagefb-i2c.c +0 -1
@@ -137,7 +137,6 @@ static int savage_setup_i2c_bus(struct sif (chan->par) {strcpy (chan->adapter.name, name); chan->adapter.owner =THIS_MODULE ; - chan->adapter.id =I2C_HW_B_SAVAGE ; chan->adapter.algo_data = &chan->algo; chan->adapter.dev.parent = &chan->par->pcidev->dev; chan->algo.udelay =10 ;
include/linux/i2c-id.h +0 -51
74 lines not on this page · raw message
Signature · 1 line
Jean Delvare