diff options
| author |   Jean Delvare <khali@linux-fr.org> | 2006-12-10 21:21:33 +0100 |
|---|---|---|
| committer |   Jean Delvare <khali@arrakis.delvare> | 2006-12-10 21:21:33 +0100 |
| commit | 3269711b76ba27b78862c48398b0d313ccaa99c2 (patch) | |
| tree | fcd2daf3af9b20bb72ba28555cac1995312309c5 /drivers/media/video/cx88 | |
| parent | i2c: New ARM Versatile/Realview bus driver (diff) | |
| download | linux-dev-3269711b76ba27b78862c48398b0d313ccaa99c2.tar.xz linux-dev-3269711b76ba27b78862c48398b0d313ccaa99c2.zip | |
i2c: 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@linux-fr.org>
Diffstat (limited to 'drivers/media/video/cx88')
| -rw-r--r-- | drivers/media/video/cx88/cx88-core.c | 2 | ||||
| -rw-r--r-- | drivers/media/video/cx88/cx88-vp3054-i2c.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c index 4b655f2ef278..453af5e943ff 100644 --- a/drivers/media/video/cx88/cx88-core.c +++ b/drivers/media/video/cx88/cx88-core.c @@ -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--; diff --git a/drivers/media/video/cx88/cx88-vp3054-i2c.c b/drivers/media/video/cx88/cx88-vp3054-i2c.c index 2b4f1970c7df..6068c9bf82cd 100644 --- a/drivers/media/video/cx88/cx88-vp3054-i2c.c +++ b/drivers/media/video/cx88/cx88-vp3054-i2c.c @@ -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); } |