[prev in list] [next in list] [prev in thread] [next in thread]
List: linux-i2c
Subject: [i2c] [PATCH] Discard the i2c algo del_bus wrappers
From: khali () linux-fr ! org (Jean Delvare)
Date: 2006-11-30 19:50:01
Message-ID: 20061130205001.ff8e3fb3.khali () linux-fr ! org
[Download RAW message or body]
Hi all,
It occured to me that the i2c_xxx_del_bus wrappers in the various i2c
algorithm drivers were totally useless, and we could get rid of them
for shorter and faster code. Any objection to the patch below?
* * * * *
Discard the i2c algo del_bus wrappers. They are all only calling
i2c_del_adapter, so we may as well do it directly.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
---
drivers/acorn/char/i2c.c | 2 +-
drivers/i2c/algos/i2c-algo-bit.c | 8 --------
drivers/i2c/algos/i2c-algo-pca.c | 7 -------
drivers/i2c/algos/i2c-algo-pcf.c | 8 --------
drivers/i2c/algos/i2c-algo-sgi.c | 8 --------
drivers/i2c/busses/i2c-elektor.c | 2 +-
drivers/i2c/busses/i2c-hydra.c | 2 +-
drivers/i2c/busses/i2c-i810.c | 6 +++---
drivers/i2c/busses/i2c-ixp2000.c | 2 +-
drivers/i2c/busses/i2c-ixp4xx.c | 2 +-
drivers/i2c/busses/i2c-parport-light.c | 2 +-
drivers/i2c/busses/i2c-parport.c | 2 +-
drivers/i2c/busses/i2c-pca-isa.c | 2 +-
drivers/i2c/busses/i2c-prosavage.c | 2 +-
drivers/i2c/busses/i2c-savage4.c | 2 +-
drivers/i2c/busses/i2c-via.c | 2 +-
drivers/i2c/busses/i2c-voodoo3.c | 6 +++---
drivers/i2c/busses/scx200_i2c.c | 2 +-
drivers/ieee1394/pcilynx.c | 2 +-
drivers/media/dvb/pluto2/pluto2.c | 8 ++++----
drivers/media/video/bt8xx/bttv-i2c.c | 6 +-----
drivers/media/video/cx88/cx88-core.c | 2 +-
drivers/media/video/cx88/cx88-vp3054-i2c.c | 2 +-
drivers/media/video/vino.c | 2 +-
drivers/media/video/zoran_card.c | 2 +-
drivers/video/aty/radeon_i2c.c | 8 ++++----
drivers/video/i810/i810-i2c.c | 6 +++---
drivers/video/intelfb/intelfb_i2c.c | 4 ++--
drivers/video/matrox/i2c-matroxfb.c | 2 +-
drivers/video/nvidia/nv_i2c.c | 6 +++---
drivers/video/riva/rivafb-i2c.c | 6 +++---
drivers/video/savage/savagefb-i2c.c | 2 +-
include/linux/i2c-algo-bit.h | 1 -
include/linux/i2c-algo-pca.h | 1 -
include/linux/i2c-algo-pcf.h | 1 -
include/linux/i2c-algo-sgi.h | 1 -
36 files changed, 45 insertions(+), 84 deletions(-)
--- linux-2.6.19-rc6.orig/drivers/acorn/char/i2c.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/acorn/char/i2c.c 2006-11-30 20:05:00.000000000 +0100
@@ -360,7 +360,7 @@
if (ret >= 0){
ret = misc_register(&rtc_dev);
if(ret < 0)
- i2c_bit_del_bus(&ioc_ops);
+ i2c_del_adapter(&ioc_ops);
}
return ret;
--- linux-2.6.19-rc6.orig/drivers/i2c/algos/i2c-algo-bit.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/i2c/algos/i2c-algo-bit.c 2006-11-30 20:05:00.000000000 +0100
@@ -540,15 +540,7 @@
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 at tk.uni-linz.ac.at>");
MODULE_DESCRIPTION("I2C-Bus bit-banging algorithm");
--- linux-2.6.19-rc6.orig/drivers/i2c/algos/i2c-algo-pca.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/i2c/algos/i2c-algo-pca.c 2006-11-30 20:05:00.000000000 +0100
@@ -381,14 +381,7 @@
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 at arcom.com>");
MODULE_DESCRIPTION("I2C-Bus PCA9564 algorithm");
--- linux-2.6.19-rc6.orig/drivers/i2c/algos/i2c-algo-pcf.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/i2c/algos/i2c-algo-pcf.c 2006-11-30 20:05:00.000000000 +0100
@@ -486,15 +486,7 @@
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 at spacetec.no>");
MODULE_DESCRIPTION("I2C-Bus PCF8584 algorithm");
--- linux-2.6.19-rc6.orig/drivers/i2c/algos/i2c-algo-sgi.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/i2c/algos/i2c-algo-sgi.c 2006-11-30 20:05:00.000000000 +0100
@@ -171,15 +171,7 @@
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 at linux-mips.org>");
MODULE_DESCRIPTION("I2C-Bus SGI algorithm");
--- linux-2.6.19-rc6.orig/drivers/i2c/busses/i2c-elektor.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/i2c/busses/i2c-elektor.c 2006-11-30 20:05:00.000000000 +0100
@@ -293,7 +293,7 @@
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);
--- linux-2.6.19-rc6.orig/drivers/i2c/busses/i2c-hydra.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/i2c/busses/i2c-hydra.c 2006-11-30 20:05:00.000000000 +0100
@@ -146,7 +146,7 @@
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);
--- linux-2.6.19-rc6.orig/drivers/i2c/busses/i2c-i810.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/i2c/busses/i2c-i810.c 2006-11-30 20:05:00.000000000 +0100
@@ -219,14 +219,14 @@
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);
}
--- linux-2.6.19-rc6.orig/drivers/i2c/busses/i2c-ixp2000.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/i2c/busses/i2c-ixp2000.c 2006-11-30 20:05:00.000000000 +0100
@@ -90,7 +90,7 @@
platform_set_drvdata(plat_dev, NULL);
- i2c_bit_del_bus(&drv_data->adapter);
+ i2c_del_adapter(&drv_data->adapter);
kfree(drv_data);
--- linux-2.6.19-rc6.orig/drivers/i2c/busses/i2c-ixp4xx.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/i2c/busses/i2c-ixp4xx.c 2006-11-30 20:05:00.000000000 +0100
@@ -91,7 +91,7 @@
platform_set_drvdata(plat_dev, NULL);
- i2c_bit_del_bus(&drv_data->adapter);
+ i2c_del_adapter(&drv_data->adapter);
kfree(drv_data);
--- linux-2.6.19-rc6.orig/drivers/i2c/busses/i2c-parport-light.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/i2c/busses/i2c-parport-light.c 2006-11-30 20:05:00.000000000 +0100
@@ -163,7 +163,7 @@
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);
}
--- linux-2.6.19-rc6.orig/drivers/i2c/busses/i2c-parport.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/i2c/busses/i2c-parport.c 2006-11-30 20:05:00.000000000 +0100
@@ -218,7 +218,7 @@
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;
--- linux-2.6.19-rc6.orig/drivers/i2c/busses/i2c-pca-isa.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/i2c/busses/i2c-pca-isa.c 2006-11-30 20:05:00.000000000 +0100
@@ -156,7 +156,7 @@
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);
--- linux-2.6.19-rc6.orig/drivers/i2c/busses/i2c-prosavage.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/i2c/busses/i2c-prosavage.c 2006-11-30 20:05:00.000000000 +0100
@@ -212,7 +212,7 @@
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);
--- linux-2.6.19-rc6.orig/drivers/i2c/busses/i2c-savage4.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/i2c/busses/i2c-savage4.c 2006-11-30 20:05:00.000000000 +0100
@@ -173,7 +173,7 @@
static void __devexit savage4_remove(struct pci_dev *dev)
{
- i2c_bit_del_bus(&savage4_i2c_adapter);
+ i2c_del_adapter(&savage4_i2c_adapter);
iounmap(ioaddr);
}
--- linux-2.6.19-rc6.orig/drivers/i2c/busses/i2c-via.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/i2c/busses/i2c-via.c 2006-11-30 20:05:00.000000000 +0100
@@ -151,7 +151,7 @@
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;
}
--- linux-2.6.19-rc6.orig/drivers/i2c/busses/i2c-voodoo3.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/i2c/busses/i2c-voodoo3.c 2006-11-30 20:05:00.000000000 +0100
@@ -211,14 +211,14 @@
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);
}
--- linux-2.6.19-rc6.orig/drivers/i2c/busses/scx200_i2c.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/i2c/busses/scx200_i2c.c 2006-11-30 20:05:00.000000000 +0100
@@ -116,7 +116,7 @@
static void scx200_i2c_cleanup(void)
{
- i2c_bit_del_bus(&scx200_i2c_ops);
+ i2c_del_adapter(&scx200_i2c_ops);
}
module_init(scx200_i2c_init);
--- linux-2.6.19-rc6.orig/drivers/ieee1394/pcilynx.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/ieee1394/pcilynx.c 2006-11-30 20:05:00.000000000 +0100
@@ -1486,7 +1486,7 @@
}
- i2c_bit_del_bus(i2c_ad);
+ i2c_del_adapter(i2c_ad);
kfree(i2c_ad);
}
}
--- linux-2.6.19-rc6.orig/drivers/media/dvb/pluto2/pluto2.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/media/dvb/pluto2/pluto2.c 2006-11-30 20:05:00.000000000 +0100
@@ -650,7 +650,7 @@
/* 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;
@@ -712,8 +712,8 @@
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:
@@ -748,7 +748,7 @@
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);
--- linux-2.6.19-rc6.orig/drivers/media/video/bt8xx/bttv-i2c.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/media/video/bt8xx/bttv-i2c.c 2006-11-30 20:05:00.000000000 +0100
@@ -479,11 +479,7 @@
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);
}
/*
--- linux-2.6.19-rc6.orig/drivers/media/video/cx88/cx88-core.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/media/video/cx88/cx88-core.c 2006-11-30 20:05:00.000000000 +0100
@@ -1153,7 +1153,7 @@
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--;
--- linux-2.6.19-rc6.orig/drivers/media/video/cx88/cx88-vp3054-i2c.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/media/video/cx88/cx88-vp3054-i2c.c 2006-11-30 20:07:28.000000000 +0100
@@ -168,7 +168,7 @@
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);
}
--- linux-2.6.19-rc6.orig/drivers/media/video/vino.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/media/video/vino.c 2006-11-30 20:05:00.000000000 +0100
@@ -782,7 +782,7 @@
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)
--- linux-2.6.19-rc6.orig/drivers/media/video/zoran_card.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/media/video/zoran_card.c 2006-11-30 20:05:00.000000000 +0100
@@ -849,7 +849,7 @@
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 */
--- linux-2.6.19-rc6.orig/drivers/video/aty/radeon_i2c.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/video/aty/radeon_i2c.c 2006-11-30 20:05:00.000000000 +0100
@@ -120,19 +120,19 @@
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;
}
--- linux-2.6.19-rc6.orig/drivers/video/i810/i810-i2c.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/video/i810/i810-i2c.c 2006-11-30 20:05:00.000000000 +0100
@@ -137,15 +137,15 @@
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;
}
--- linux-2.6.19-rc6.orig/drivers/video/intelfb/intelfb_i2c.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/video/intelfb/intelfb_i2c.c 2006-11-30 20:05:00.000000000 +0100
@@ -188,11 +188,11 @@
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;
}
}
--- linux-2.6.19-rc6.orig/drivers/video/matrox/i2c-matroxfb.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/video/matrox/i2c-matroxfb.c 2006-11-30 20:05:00.000000000 +0100
@@ -124,7 +124,7 @@
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;
}
}
--- linux-2.6.19-rc6.orig/drivers/video/nvidia/nv_i2c.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/video/nvidia/nv_i2c.c 2006-11-30 20:05:00.000000000 +0100
@@ -147,15 +147,15 @@
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;
}
--- linux-2.6.19-rc6.orig/drivers/video/riva/rivafb-i2c.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/video/riva/rivafb-i2c.c 2006-11-30 20:05:00.000000000 +0100
@@ -144,15 +144,15 @@
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;
}
--- linux-2.6.19-rc6.orig/drivers/video/savage/savagefb-i2c.c 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/drivers/video/savage/savagefb-i2c.c 2006-11-30 20:05:00.000000000 +0100
@@ -208,7 +208,7 @@
struct savagefb_par *par = info->par;
if (par->chan.par)
- i2c_bit_del_bus(&par->chan.adapter);
+ i2c_del_adapter(&par->chan.adapter);
par->chan.par = NULL;
}
--- linux-2.6.19-rc6.orig/include/linux/i2c-algo-bit.h 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/include/linux/i2c-algo-bit.h 2006-11-30 20:05:00.000000000 +0100
@@ -44,6 +44,5 @@
};
int i2c_bit_add_bus(struct i2c_adapter *);
-int i2c_bit_del_bus(struct i2c_adapter *);
#endif /* _LINUX_I2C_ALGO_BIT_H */
--- linux-2.6.19-rc6.orig/include/linux/i2c-algo-pca.h 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/include/linux/i2c-algo-pca.h 2006-11-30 20:05:00.000000000 +0100
@@ -10,6 +10,5 @@
};
int i2c_pca_add_bus(struct i2c_adapter *);
-int i2c_pca_del_bus(struct i2c_adapter *);
#endif /* _LINUX_I2C_ALGO_PCA_H */
--- linux-2.6.19-rc6.orig/include/linux/i2c-algo-pcf.h 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/include/linux/i2c-algo-pcf.h 2006-11-30 20:05:00.000000000 +0100
@@ -39,6 +39,5 @@
};
int i2c_pcf_add_bus(struct i2c_adapter *);
-int i2c_pcf_del_bus(struct i2c_adapter *);
#endif /* _LINUX_I2C_ALGO_PCF_H */
--- linux-2.6.19-rc6.orig/include/linux/i2c-algo-sgi.h 2006-11-30 19:55:56.000000000 +0100
+++ linux-2.6.19-rc6/include/linux/i2c-algo-sgi.h 2006-11-30 20:05:00.000000000 +0100
@@ -22,6 +22,5 @@
};
int i2c_sgi_add_bus(struct i2c_adapter *);
-int i2c_sgi_del_bus(struct i2c_adapter *);
#endif /* I2C_ALGO_SGI_H */
--
Jean Delvare
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic