Skip to content

Commit

Permalink
i2c: Discard the i2c algo del_bus wrappers
Browse files Browse the repository at this point in the history
They are all only calling i2c_del_adapter, so we may as well do
it directly.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
  • Loading branch information
Jean Delvare authored and Jean Delvare committed Dec 10, 2006
1 parent 6b65cd7 commit 3269711
Show file tree
Hide file tree
Showing 36 changed files with 45 additions and 84 deletions.
2 changes: 1 addition & 1 deletion drivers/acorn/char/i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ static int __init i2c_ioc_init(void)
if (ret >= 0){
ret = misc_register(&rtc_dev);
if(ret < 0)
i2c_bit_del_bus(&ioc_ops);
i2c_del_adapter(&ioc_ops);
}

return ret;
Expand Down
8 changes: 0 additions & 8 deletions drivers/i2c/algos/i2c-algo-bit.c
Original file line number Diff line number Diff line change
Expand Up @@ -540,15 +540,7 @@ int i2c_bit_add_bus(struct i2c_adapter *adap)

return i2c_add_adapter(adap);
}


int i2c_bit_del_bus(struct i2c_adapter *adap)
{
return i2c_del_adapter(adap);
}

EXPORT_SYMBOL(i2c_bit_add_bus);
EXPORT_SYMBOL(i2c_bit_del_bus);

MODULE_AUTHOR("Simon G. Vogl <simon@tk.uni-linz.ac.at>");
MODULE_DESCRIPTION("I2C-Bus bit-banging algorithm");
Expand Down
7 changes: 0 additions & 7 deletions drivers/i2c/algos/i2c-algo-pca.c
Original file line number Diff line number Diff line change
Expand Up @@ -381,14 +381,7 @@ int i2c_pca_add_bus(struct i2c_adapter *adap)

return rval;
}

int i2c_pca_del_bus(struct i2c_adapter *adap)
{
return i2c_del_adapter(adap);
}

EXPORT_SYMBOL(i2c_pca_add_bus);
EXPORT_SYMBOL(i2c_pca_del_bus);

MODULE_AUTHOR("Ian Campbell <icampbell@arcom.com>");
MODULE_DESCRIPTION("I2C-Bus PCA9564 algorithm");
Expand Down
8 changes: 0 additions & 8 deletions drivers/i2c/algos/i2c-algo-pcf.c
Original file line number Diff line number Diff line change
Expand Up @@ -486,15 +486,7 @@ int i2c_pcf_add_bus(struct i2c_adapter *adap)

return rval;
}


int i2c_pcf_del_bus(struct i2c_adapter *adap)
{
return i2c_del_adapter(adap);
}

EXPORT_SYMBOL(i2c_pcf_add_bus);
EXPORT_SYMBOL(i2c_pcf_del_bus);

MODULE_AUTHOR("Hans Berglund <hb@spacetec.no>");
MODULE_DESCRIPTION("I2C-Bus PCF8584 algorithm");
Expand Down
8 changes: 0 additions & 8 deletions drivers/i2c/algos/i2c-algo-sgi.c
Original file line number Diff line number Diff line change
Expand Up @@ -171,15 +171,7 @@ int i2c_sgi_add_bus(struct i2c_adapter *adap)

return i2c_add_adapter(adap);
}


int i2c_sgi_del_bus(struct i2c_adapter *adap)
{
return i2c_del_adapter(adap);
}

EXPORT_SYMBOL(i2c_sgi_add_bus);
EXPORT_SYMBOL(i2c_sgi_del_bus);

MODULE_AUTHOR("Ladislav Michl <ladis@linux-mips.org>");
MODULE_DESCRIPTION("I2C-Bus SGI algorithm");
Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-elektor.c
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ static int __init i2c_pcfisa_init(void)

static void i2c_pcfisa_exit(void)
{
i2c_pcf_del_bus(&pcf_isa_ops);
i2c_del_adapter(&pcf_isa_ops);

if (irq > 0) {
disable_irq(irq);
Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-hydra.c
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ static int __devinit hydra_probe(struct pci_dev *dev,
static void __devexit hydra_remove(struct pci_dev *dev)
{
pdregw(hydra_bit_data.data, 0); /* clear SCLK_OE and SDAT_OE */
i2c_bit_del_bus(&hydra_adap);
i2c_del_adapter(&hydra_adap);
iounmap(hydra_bit_data.data);
release_mem_region(pci_resource_start(dev, 0)+
offsetof(struct Hydra, CachePD), 4);
Expand Down
6 changes: 3 additions & 3 deletions drivers/i2c/busses/i2c-i810.c
Original file line number Diff line number Diff line change
Expand Up @@ -219,14 +219,14 @@ static int __devinit i810_probe(struct pci_dev *dev, const struct pci_device_id
return retval;
retval = i2c_bit_add_bus(&i810_ddc_adapter);
if (retval)
i2c_bit_del_bus(&i810_i2c_adapter);
i2c_del_adapter(&i810_i2c_adapter);
return retval;
}

static void __devexit i810_remove(struct pci_dev *dev)
{
i2c_bit_del_bus(&i810_ddc_adapter);
i2c_bit_del_bus(&i810_i2c_adapter);
i2c_del_adapter(&i810_ddc_adapter);
i2c_del_adapter(&i810_i2c_adapter);
iounmap(ioaddr);
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-ixp2000.c
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ static int ixp2000_i2c_remove(struct platform_device *plat_dev)

platform_set_drvdata(plat_dev, NULL);

i2c_bit_del_bus(&drv_data->adapter);
i2c_del_adapter(&drv_data->adapter);

kfree(drv_data);

Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-ixp4xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ static int ixp4xx_i2c_remove(struct platform_device *plat_dev)

platform_set_drvdata(plat_dev, NULL);

i2c_bit_del_bus(&drv_data->adapter);
i2c_del_adapter(&drv_data->adapter);

kfree(drv_data);

Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-parport-light.c
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ static void __exit i2c_parport_exit(void)
if (adapter_parm[type].init.val)
line_set(0, &adapter_parm[type].init);

i2c_bit_del_bus(&parport_adapter);
i2c_del_adapter(&parport_adapter);
release_region(base, 3);
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-parport.c
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ static void i2c_parport_detach (struct parport *port)
if (adapter_parm[type].init.val)
line_set(port, 0, &adapter_parm[type].init);

i2c_bit_del_bus(&adapter->adapter);
i2c_del_adapter(&adapter->adapter);
parport_unregister_device(adapter->pdev);
if (prev)
prev->next = adapter->next;
Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-pca-isa.c
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ static int __init pca_isa_init(void)

static void pca_isa_exit(void)
{
i2c_pca_del_bus(&pca_isa_ops);
i2c_del_adapter(&pca_isa_ops);

if (irq > 0) {
disable_irq(irq);
Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-prosavage.c
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ static void prosavage_remove(struct pci_dev *dev)
if (chip->i2c_bus[i].adap_ok == 0)
continue;

ret = i2c_bit_del_bus(&chip->i2c_bus[i].adap);
ret = i2c_del_adapter(&chip->i2c_bus[i].adap);
if (ret) {
dev_err(&dev->dev, "%s not removed\n",
chip->i2c_bus[i].adap.name);
Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-savage4.c
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ static int __devinit savage4_probe(struct pci_dev *dev, const struct pci_device_

static void __devexit savage4_remove(struct pci_dev *dev)
{
i2c_bit_del_bus(&savage4_i2c_adapter);
i2c_del_adapter(&savage4_i2c_adapter);
iounmap(ioaddr);
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-via.c
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ static int __devinit vt586b_probe(struct pci_dev *dev, const struct pci_device_i

static void __devexit vt586b_remove(struct pci_dev *dev)
{
i2c_bit_del_bus(&vt586b_adapter);
i2c_del_adapter(&vt586b_adapter);
release_region(I2C_DIR, IOSPACE);
pm_io_base = 0;
}
Expand Down
6 changes: 3 additions & 3 deletions drivers/i2c/busses/i2c-voodoo3.c
Original file line number Diff line number Diff line change
Expand Up @@ -211,14 +211,14 @@ static int __devinit voodoo3_probe(struct pci_dev *dev, const struct pci_device_
return retval;
retval = i2c_bit_add_bus(&voodoo3_ddc_adapter);
if (retval)
i2c_bit_del_bus(&voodoo3_i2c_adapter);
i2c_del_adapter(&voodoo3_i2c_adapter);
return retval;
}

static void __devexit voodoo3_remove(struct pci_dev *dev)
{
i2c_bit_del_bus(&voodoo3_i2c_adapter);
i2c_bit_del_bus(&voodoo3_ddc_adapter);
i2c_del_adapter(&voodoo3_i2c_adapter);
i2c_del_adapter(&voodoo3_ddc_adapter);
iounmap(ioaddr);
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/scx200_i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ static int scx200_i2c_init(void)

static void scx200_i2c_cleanup(void)
{
i2c_bit_del_bus(&scx200_i2c_ops);
i2c_del_adapter(&scx200_i2c_ops);
}

module_init(scx200_i2c_init);
Expand Down
2 changes: 1 addition & 1 deletion drivers/ieee1394/pcilynx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1485,7 +1485,7 @@ static int __devinit add_card(struct pci_dev *dev,

}

i2c_bit_del_bus(i2c_ad);
i2c_del_adapter(i2c_ad);
kfree(i2c_ad);
}
}
Expand Down
8 changes: 4 additions & 4 deletions drivers/media/dvb/pluto2/pluto2.c
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ static int __devinit pluto2_probe(struct pci_dev *pdev,
/* dvb */
ret = dvb_register_adapter(&pluto->dvb_adapter, DRIVER_NAME, THIS_MODULE, &pdev->dev);
if (ret < 0)
goto err_i2c_bit_del_bus;
goto err_i2c_del_adapter;

dvb_adapter = &pluto->dvb_adapter;

Expand Down Expand Up @@ -712,8 +712,8 @@ static int __devinit pluto2_probe(struct pci_dev *pdev,
dvb_dmx_release(dvbdemux);
err_dvb_unregister_adapter:
dvb_unregister_adapter(dvb_adapter);
err_i2c_bit_del_bus:
i2c_bit_del_bus(&pluto->i2c_adap);
err_i2c_del_adapter:
i2c_del_adapter(&pluto->i2c_adap);
err_pluto_hw_exit:
pluto_hw_exit(pluto);
err_free_irq:
Expand Down Expand Up @@ -748,7 +748,7 @@ static void __devexit pluto2_remove(struct pci_dev *pdev)
dvb_dmxdev_release(&pluto->dmxdev);
dvb_dmx_release(dvbdemux);
dvb_unregister_adapter(dvb_adapter);
i2c_bit_del_bus(&pluto->i2c_adap);
i2c_del_adapter(&pluto->i2c_adap);
pluto_hw_exit(pluto);
free_irq(pdev->irq, pluto);
pci_iounmap(pdev, pluto->io_mem);
Expand Down
6 changes: 1 addition & 5 deletions drivers/media/video/bt8xx/bttv-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -479,11 +479,7 @@ int __devexit fini_bttv_i2c(struct bttv *btv)
if (0 != btv->i2c_rc)
return 0;

if (btv->use_i2c_hw) {
return i2c_del_adapter(&btv->c.i2c_adap);
} else {
return i2c_bit_del_bus(&btv->c.i2c_adap);
}
return i2c_del_adapter(&btv->c.i2c_adap);
}

/*
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/video/cx88/cx88-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1153,7 +1153,7 @@ void cx88_core_put(struct cx88_core *core, struct pci_dev *pci)
mutex_lock(&devlist);
cx88_ir_fini(core);
if (0 == core->i2c_rc)
i2c_bit_del_bus(&core->i2c_adap);
i2c_del_adapter(&core->i2c_adap);
list_del(&core->devlist);
iounmap(core->lmmio);
cx88_devcount--;
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/video/cx88/cx88-vp3054-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ void vp3054_i2c_remove(struct cx8802_dev *dev)
dev->core->board != CX88_BOARD_DNTV_LIVE_DVB_T_PRO)
return;

i2c_bit_del_bus(&vp3054_i2c->adap);
i2c_del_adapter(&vp3054_i2c->adap);
kfree(vp3054_i2c);
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/media/video/vino.c
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,7 @@ static int vino_i2c_add_bus(void)

static int vino_i2c_del_bus(void)
{
return i2c_sgi_del_bus(&vino_i2c_adapter);
return i2c_del_adapter(&vino_i2c_adapter);
}

static int i2c_camera_command(unsigned int cmd, void *arg)
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/video/zoran_card.c
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,7 @@ zoran_register_i2c (struct zoran *zr)
static void
zoran_unregister_i2c (struct zoran *zr)
{
i2c_bit_del_bus((&zr->i2c_adapter));
i2c_del_adapter(&zr->i2c_adapter);
}

/* Check a zoran_params struct for correctness, insert default params */
Expand Down
8 changes: 4 additions & 4 deletions drivers/video/aty/radeon_i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,19 +120,19 @@ void radeon_create_i2c_busses(struct radeonfb_info *rinfo)
void radeon_delete_i2c_busses(struct radeonfb_info *rinfo)
{
if (rinfo->i2c[0].rinfo)
i2c_bit_del_bus(&rinfo->i2c[0].adapter);
i2c_del_adapter(&rinfo->i2c[0].adapter);
rinfo->i2c[0].rinfo = NULL;

if (rinfo->i2c[1].rinfo)
i2c_bit_del_bus(&rinfo->i2c[1].adapter);
i2c_del_adapter(&rinfo->i2c[1].adapter);
rinfo->i2c[1].rinfo = NULL;

if (rinfo->i2c[2].rinfo)
i2c_bit_del_bus(&rinfo->i2c[2].adapter);
i2c_del_adapter(&rinfo->i2c[2].adapter);
rinfo->i2c[2].rinfo = NULL;

if (rinfo->i2c[3].rinfo)
i2c_bit_del_bus(&rinfo->i2c[3].adapter);
i2c_del_adapter(&rinfo->i2c[3].adapter);
rinfo->i2c[3].rinfo = NULL;
}

Expand Down
6 changes: 3 additions & 3 deletions drivers/video/i810/i810-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,15 +137,15 @@ void i810_create_i2c_busses(struct i810fb_par *par)
void i810_delete_i2c_busses(struct i810fb_par *par)
{
if (par->chan[0].par)
i2c_bit_del_bus(&par->chan[0].adapter);
i2c_del_adapter(&par->chan[0].adapter);
par->chan[0].par = NULL;

if (par->chan[1].par)
i2c_bit_del_bus(&par->chan[1].adapter);
i2c_del_adapter(&par->chan[1].adapter);
par->chan[1].par = NULL;

if (par->chan[2].par)
i2c_bit_del_bus(&par->chan[2].adapter);
i2c_del_adapter(&par->chan[2].adapter);
par->chan[2].par = NULL;
}

Expand Down
4 changes: 2 additions & 2 deletions drivers/video/intelfb/intelfb_i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,11 @@ void intelfb_delete_i2c_busses(struct intelfb_info *dinfo)

for (i = 0; i < MAX_OUTPUTS; i++) {
if (dinfo->output[i].i2c_bus.dinfo) {
i2c_bit_del_bus(&dinfo->output[i].i2c_bus.adapter);
i2c_del_adapter(&dinfo->output[i].i2c_bus.adapter);
dinfo->output[i].i2c_bus.dinfo = NULL;
}
if (dinfo->output[i].ddc_bus.dinfo) {
i2c_bit_del_bus(&dinfo->output[i].ddc_bus.adapter);
i2c_del_adapter(&dinfo->output[i].ddc_bus.adapter);
dinfo->output[i].ddc_bus.dinfo = NULL;
}
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/matrox/i2c-matroxfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ static int i2c_bus_reg(struct i2c_bit_adapter* b, struct matrox_fb_info* minfo,

static void i2c_bit_bus_del(struct i2c_bit_adapter* b) {
if (b->initialized) {
i2c_bit_del_bus(&b->adapter);
i2c_del_adapter(&b->adapter);
b->initialized = 0;
}
}
Expand Down
6 changes: 3 additions & 3 deletions drivers/video/nvidia/nv_i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -147,15 +147,15 @@ void nvidia_create_i2c_busses(struct nvidia_par *par)
void nvidia_delete_i2c_busses(struct nvidia_par *par)
{
if (par->chan[0].par)
i2c_bit_del_bus(&par->chan[0].adapter);
i2c_del_adapter(&par->chan[0].adapter);
par->chan[0].par = NULL;

if (par->chan[1].par)
i2c_bit_del_bus(&par->chan[1].adapter);
i2c_del_adapter(&par->chan[1].adapter);
par->chan[1].par = NULL;

if (par->chan[2].par)
i2c_bit_del_bus(&par->chan[2].adapter);
i2c_del_adapter(&par->chan[2].adapter);
par->chan[2].par = NULL;

}
Expand Down
6 changes: 3 additions & 3 deletions drivers/video/riva/rivafb-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,15 +144,15 @@ void riva_create_i2c_busses(struct riva_par *par)
void riva_delete_i2c_busses(struct riva_par *par)
{
if (par->chan[0].par)
i2c_bit_del_bus(&par->chan[0].adapter);
i2c_del_adapter(&par->chan[0].adapter);
par->chan[0].par = NULL;

if (par->chan[1].par)
i2c_bit_del_bus(&par->chan[1].adapter);
i2c_del_adapter(&par->chan[1].adapter);
par->chan[1].par = NULL;

if (par->chan[2].par)
i2c_bit_del_bus(&par->chan[2].adapter);
i2c_del_adapter(&par->chan[2].adapter);
par->chan[2].par = NULL;
}

Expand Down
Loading

0 comments on commit 3269711

Please sign in to comment.