viafb: rework the I2C support in the VIA framebuffer driver

This patch changes the way how the various I2C busses are used internally
inside the viafb driver:  Previosuly, only a single i2c_adapter was created,
even though two different hardware I2C busses are accessed: A structure member
in a global variable was modified to indicate the bus to be used.

Now, all existing hardware busses are registered with the i2c core, and the
viafb_i2c_{read,write}byte[s]() function take the adapter number as function
call parameter, rather than referring to the global structure member.

[jc: even more painful merge with mainline changes ->2.6.34]
[jc: painful merge with OLPC changes]

Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: ScottFang@viatech.com.cn
Cc: JosephChan@via.com.tw
Signed-off-by: Harald Welte <HaraldWelte@viatech.com>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index 8955ab4caac8..fa1004997c63 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -1775,7 +1775,7 @@ static int __devinit via_pci_probe(struct pci_dev *pdev,
                 viafb_dual_fb = 0;
 
         /* Set up I2C bus stuff */
-        rc = viafb_create_i2c_bus(viaparinfo);
+        rc = viafb_create_i2c_busses(viaparinfo);
         if (rc)
                 goto out_fb_release;
 
@@ -1964,7 +1964,7 @@ out_fb1_release:
 out_unmap_screen:
         iounmap(viafbinfo->screen_base);
 out_delete_i2c:
-        viafb_delete_i2c_buss(viaparinfo);
+        viafb_delete_i2c_busses(viaparinfo);
 out_fb_release:
         framebuffer_release(viafbinfo);
         return rc;
@@ -1980,7 +1980,7 @@ static void __devexit via_pci_remove(struct pci_dev *pdev)
         iounmap((void *)viafbinfo->screen_base);
         iounmap(viaparinfo->shared->engine_mmio);
 
-        viafb_delete_i2c_buss(viaparinfo);
+        viafb_delete_i2c_busses(viaparinfo);
 
         framebuffer_release(viafbinfo);
         if (viafb_dual_fb)