Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / video / riva / rivafb-i2c.c

diff --git a/drivers/video/riva/rivafb-i2c.c b/drivers/video/riva/rivafb-i2c.c
index da1334d..8b1967f 100644 (file)
--- a/drivers/video/riva/rivafb-i2c.c
+++ b/drivers/video/riva/rivafb-i2c.c
@@ -30,7 +30,7 @@
 
 static void riva_gpio_setscl(void* data, int state)
 {
-       struct riva_i2c_chan    *chan = (struct riva_i2c_chan *)data;
+       struct riva_i2c_chan    *chan = data;
        struct riva_par         *par = chan->par;
        u32                     val;
 
@@ -48,7 +48,7 @@ static void riva_gpio_setscl(void* data, int state)
 
 static void riva_gpio_setsda(void* data, int state)
 {
-       struct riva_i2c_chan    *chan = (struct riva_i2c_chan *)data;
+       struct riva_i2c_chan    *chan = data;
        struct riva_par         *par = chan->par;
        u32                     val;
 
@@ -66,7 +66,7 @@ static void riva_gpio_setsda(void* data, int state)
 
 static int riva_gpio_getscl(void* data)
 {
-       struct riva_i2c_chan    *chan = (struct riva_i2c_chan *)data;
+       struct riva_i2c_chan    *chan = data;
        struct riva_par         *par = chan->par;
        u32                     val = 0;
 
@@ -81,7 +81,7 @@ static int riva_gpio_getscl(void* data)
 
 static int riva_gpio_getsda(void* data)
 {
-       struct riva_i2c_chan    *chan = (struct riva_i2c_chan *)data;
+       struct riva_i2c_chan    *chan = data;
        struct riva_par         *par = chan->par;
        u32                     val = 0;
 
@@ -92,14 +92,13 @@ static int riva_gpio_getsda(void* data)
        return val;
 }
 
-#define I2C_ALGO_RIVA   0x0e0000
 static int riva_setup_i2c_bus(struct riva_i2c_chan *chan, const char *name)
 {
        int rc;
 
        strcpy(chan->adapter.name, name);
        chan->adapter.owner             = THIS_MODULE;
-       chan->adapter.id                = I2C_ALGO_RIVA;
+       chan->adapter.id                = I2C_HW_B_RIVA;
        chan->adapter.algo_data         = &chan->algo;
        chan->adapter.dev.parent        = &chan->par->pdev->dev;
        chan->algo.setsda               = riva_gpio_setsda;