matroxfb: get rid of unneeded macros ACCESS_FBINFO and MINFO

With multihead support always enabled, these macros are no longer needed
and make the code harder to read.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Petr Vandrovec <vandrove@vc.cvut.cz>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/video/matrox/i2c-matroxfb.c b/drivers/video/matrox/i2c-matroxfb.c
index c14e3e2212b3..cefabe818a12 100644
--- a/drivers/video/matrox/i2c-matroxfb.c
+++ b/drivers/video/matrox/i2c-matroxfb.c
@@ -112,7 +112,7 @@ static int i2c_bus_reg(struct i2c_bit_adapter* b, struct matrox_fb_info* minfo,
         i2c_set_adapdata(&b->adapter, b);
         b->adapter.class = class;
         b->adapter.algo_data = &b->bac;
-        b->adapter.dev.parent = &ACCESS_FBINFO(pcidev)->dev;
+        b->adapter.dev.parent = &minfo->pcidev->dev;
         b->bac = matrox_i2c_algo_template;
         b->bac.data = b;
         err = i2c_bit_add_bus(&b->adapter);
@@ -153,7 +153,7 @@ static void* i2c_matroxfb_probe(struct matrox_fb_info* minfo) {
         matroxfb_DAC_out(PMINFO DAC_XGENIOCTRL, 0x00);
         matroxfb_DAC_unlock_irqrestore(flags);
 
-        switch (ACCESS_FBINFO(chip)) {
+        switch (minfo->chip) {
                 case MGA_2064:
                 case MGA_2164:
                         err = i2c_bus_reg(&m2info->ddc1, minfo,
@@ -168,7 +168,7 @@ static void* i2c_matroxfb_probe(struct matrox_fb_info* minfo) {
         }
         if (err)
                 goto fail_ddc1;
-        if (ACCESS_FBINFO(devflags.dualhead)) {
+        if (minfo->devflags.dualhead) {
                 err = i2c_bus_reg(&m2info->ddc2, minfo,
                                   DDC2_DATA, DDC2_CLK,
                                   "DDC:fb%u #1", I2C_CLASS_DDC);