Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c: Fix OMAP clock prescaler to match the comment
  i2c: Refactor a kfree in i2c-dev
  i2c: Fix return value check in i2c-dev
  i2c: Enable PEC on more i2c-i801 devices
  i2c: Discard the i2c algo del_bus wrappers
  i2c: New ARM Versatile/Realview bus driver
  i2c: fix broken ds1337 initialization
  i2c: i2c-i801 documentation update
  i2c: Use the __ATTR macro where possible
  i2c: Whitespace cleanups
  i2c: Use put_user instead of copy_to_user where possible
  i2c: New Atmel AT91 bus driver
  i2c: Add support for nested i2c bus locking
  i2c: Cleanups to the i2c-nforce2 bus driver
  i2c: Add request/release_mem_region to i2c-ibm_iic bus driver
  i2c: New Philips PNX bus driver
  i2c: Delete the broken i2c-ite bus driver
  i2c: Update the list of driver IDs
  i2c: Fix documentation typos

7 files changed, 17 insertions, 17 deletions

diff --git a/drivers/video/aty/radeon_i2c.c b/drivers/video/aty/radeon_i2c.c
index 869725a13c21..e7c5b219ad1b 100644
--- a/drivers/video/aty/radeon_i2c.c
+++ b/drivers/video/aty/radeon_i2c.c
@@ -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;
 }
 
diff --git a/drivers/video/i810/i810-i2c.c b/drivers/video/i810/i810-i2c.c
index b952e4504abe..961f4d404467 100644
--- a/drivers/video/i810/i810-i2c.c
+++ b/drivers/video/i810/i810-i2c.c
@@ -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;
 }
 
diff --git a/drivers/video/intelfb/intelfb_i2c.c b/drivers/video/intelfb/intelfb_i2c.c
index 5686e2164e39..33bc41f50540 100644
--- a/drivers/video/intelfb/intelfb_i2c.c
+++ b/drivers/video/intelfb/intelfb_i2c.c
@@ -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;
                 }
         }
diff --git a/drivers/video/matrox/i2c-matroxfb.c b/drivers/video/matrox/i2c-matroxfb.c
index 795c1a99a680..797b42305b0f 100644
--- a/drivers/video/matrox/i2c-matroxfb.c
+++ b/drivers/video/matrox/i2c-matroxfb.c
@@ -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;
         }
 }
diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c
index 442e85328341..8454adf2d178 100644
--- a/drivers/video/nvidia/nv_i2c.c
+++ b/drivers/video/nvidia/nv_i2c.c
@@ -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;
 
 }
diff --git a/drivers/video/riva/rivafb-i2c.c b/drivers/video/riva/rivafb-i2c.c
index c15b259af644..01b85e3b0ae1 100644
--- a/drivers/video/riva/rivafb-i2c.c
+++ b/drivers/video/riva/rivafb-i2c.c
@@ -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;
 }
 
diff --git a/drivers/video/savage/savagefb-i2c.c b/drivers/video/savage/savagefb-i2c.c
index cef5bf591cdf..1411f3b6a009 100644
--- a/drivers/video/savage/savagefb-i2c.c
+++ b/drivers/video/savage/savagefb-i2c.c
@@ -208,7 +208,7 @@ void savagefb_delete_i2c_busses(struct fb_info *info)
         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;
 }