diff options
author | Jean Delvare <khali@linux-fr.org> | 2006-12-10 15:21:33 -0500 |
---|---|---|
committer | Jean Delvare <khali@arrakis.delvare> | 2006-12-10 15:21:33 -0500 |
commit | 3269711b76ba27b78862c48398b0d313ccaa99c2 (patch) | |
tree | fcd2daf3af9b20bb72ba28555cac1995312309c5 /drivers/media/dvb/pluto2 | |
parent | 6b65cd742823f78a6538491982159098ab5fcae1 (diff) |
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/dvb/pluto2')
-rw-r--r-- | drivers/media/dvb/pluto2/pluto2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c index 8e4ce101eb22..ffda71dfdd65 100644 --- a/drivers/media/dvb/pluto2/pluto2.c +++ b/drivers/media/dvb/pluto2/pluto2.c | |||
@@ -650,7 +650,7 @@ static int __devinit pluto2_probe(struct pci_dev *pdev, | |||
650 | /* dvb */ | 650 | /* dvb */ |
651 | ret = dvb_register_adapter(&pluto->dvb_adapter, DRIVER_NAME, THIS_MODULE, &pdev->dev); | 651 | ret = dvb_register_adapter(&pluto->dvb_adapter, DRIVER_NAME, THIS_MODULE, &pdev->dev); |
652 | if (ret < 0) | 652 | if (ret < 0) |
653 | goto err_i2c_bit_del_bus; | 653 | goto err_i2c_del_adapter; |
654 | 654 | ||
655 | dvb_adapter = &pluto->dvb_adapter; | 655 | dvb_adapter = &pluto->dvb_adapter; |
656 | 656 | ||
@@ -712,8 +712,8 @@ err_dvb_dmx_release: | |||
712 | dvb_dmx_release(dvbdemux); | 712 | dvb_dmx_release(dvbdemux); |
713 | err_dvb_unregister_adapter: | 713 | err_dvb_unregister_adapter: |
714 | dvb_unregister_adapter(dvb_adapter); | 714 | dvb_unregister_adapter(dvb_adapter); |
715 | err_i2c_bit_del_bus: | 715 | err_i2c_del_adapter: |
716 | i2c_bit_del_bus(&pluto->i2c_adap); | 716 | i2c_del_adapter(&pluto->i2c_adap); |
717 | err_pluto_hw_exit: | 717 | err_pluto_hw_exit: |
718 | pluto_hw_exit(pluto); | 718 | pluto_hw_exit(pluto); |
719 | err_free_irq: | 719 | err_free_irq: |
@@ -748,7 +748,7 @@ static void __devexit pluto2_remove(struct pci_dev *pdev) | |||
748 | dvb_dmxdev_release(&pluto->dmxdev); | 748 | dvb_dmxdev_release(&pluto->dmxdev); |
749 | dvb_dmx_release(dvbdemux); | 749 | dvb_dmx_release(dvbdemux); |
750 | dvb_unregister_adapter(dvb_adapter); | 750 | dvb_unregister_adapter(dvb_adapter); |
751 | i2c_bit_del_bus(&pluto->i2c_adap); | 751 | i2c_del_adapter(&pluto->i2c_adap); |
752 | pluto_hw_exit(pluto); | 752 | pluto_hw_exit(pluto); |
753 | free_irq(pdev->irq, pluto); | 753 | free_irq(pdev->irq, pluto); |
754 | pci_iounmap(pdev, pluto->io_mem); | 754 | pci_iounmap(pdev, pluto->io_mem); |