Pull release into acpica branch

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/video/riva/rivafb-i2c.c b/drivers/video/riva/rivafb-i2c.c
index 77151d8e0766..8b1967fc116a 100644
--- 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;