Merge branches 'irq/genirq', 'irq/sparseirq' and 'irq/urgent' into irq/core

[linux-2.6-omap-h63xx.git] / drivers / video / savage / savagefb-i2c.c

diff --git a/drivers/video/savage/savagefb-i2c.c b/drivers/video/savage/savagefb-i2c.c
index 8db066ccca6b8ccd314120851f5e9245246199da..574b29e9f8f2dff6782a27d997001f861f750609 100644 (file)
--- a/drivers/video/savage/savagefb-i2c.c
+++ b/drivers/video/savage/savagefb-i2c.c
@@ -41,10 +41,6 @@
 #define SAVAGE4_I2C_SCL_IN     0x00000008
 #define SAVAGE4_I2C_SDA_IN     0x00000010
 
-#define SET_CR_IX(base, val)   writeb((val), base + 0x8000 + VGA_CR_IX)
-#define SET_CR_DATA(base, val) writeb((val), base + 0x8000 + VGA_CR_DATA)
-#define GET_CR_DATA(base)      readb(base + 0x8000 + VGA_CR_DATA)
-
 static void savage4_gpio_setscl(void *data, int val)
 {
        struct savagefb_i2c_chan *chan = data;
@@ -92,15 +88,15 @@ static void prosavage_gpio_setscl(void* data, int val)
        struct savagefb_i2c_chan *chan = data;
        u32                       r;
 
-       SET_CR_IX(chan->ioaddr, chan->reg);
-       r = GET_CR_DATA(chan->ioaddr);
+       r = VGArCR(chan->reg, chan->par);
        r |= PROSAVAGE_I2C_ENAB;
        if (val) {
                r |= PROSAVAGE_I2C_SCL_OUT;
        } else {
                r &= ~PROSAVAGE_I2C_SCL_OUT;
        }
-       SET_CR_DATA(chan->ioaddr, r);
+
+       VGAwCR(chan->reg, r, chan->par);
 }
 
 static void prosavage_gpio_setsda(void* data, int val)
@@ -108,31 +104,29 @@ static void prosavage_gpio_setsda(void* data, int val)
        struct savagefb_i2c_chan *chan = data;
        unsigned int r;
 
-       SET_CR_IX(chan->ioaddr, chan->reg);
-       r = GET_CR_DATA(chan->ioaddr);
+       r = VGArCR(chan->reg, chan->par);
        r |= PROSAVAGE_I2C_ENAB;
        if (val) {
                r |= PROSAVAGE_I2C_SDA_OUT;
        } else {
                r &= ~PROSAVAGE_I2C_SDA_OUT;
        }
-       SET_CR_DATA(chan->ioaddr, r);
+
+       VGAwCR(chan->reg, r, chan->par);
 }
 
 static int prosavage_gpio_getscl(void* data)
 {
        struct savagefb_i2c_chan *chan = data;
 
-       SET_CR_IX(chan->ioaddr, chan->reg);
-       return (0 != (GET_CR_DATA(chan->ioaddr) & PROSAVAGE_I2C_SCL_IN));
+       return (VGArCR(chan->reg, chan->par) & PROSAVAGE_I2C_SCL_IN) ? 1 : 0;
 }
 
 static int prosavage_gpio_getsda(void* data)
 {
        struct savagefb_i2c_chan *chan = data;
 
-       SET_CR_IX(chan->ioaddr, chan->reg);
-       return (0 != (GET_CR_DATA(chan->ioaddr) & PROSAVAGE_I2C_SDA_IN));
+       return (VGArCR(chan->reg, chan->par) & PROSAVAGE_I2C_SDA_IN) ? 1 : 0;
 }
 
 static int savage_setup_i2c_bus(struct savagefb_i2c_chan *chan,
@@ -143,10 +137,9 @@ static int savage_setup_i2c_bus(struct savagefb_i2c_chan *chan,
        if (chan->par) {
                strcpy(chan->adapter.name, name);
                chan->adapter.owner             = THIS_MODULE;
-               chan->adapter.id                = I2C_HW_B_SAVAGE;
                chan->adapter.algo_data         = &chan->algo;
                chan->adapter.dev.parent        = &chan->par->pcidev->dev;
-               chan->algo.udelay               = 40;
+               chan->algo.udelay               = 10;
                chan->algo.timeout              = 20;
                chan->algo.data                 = chan;