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, 65 insertions, 65 deletions

diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c
index ebcb5c6b496..8249959cde2 100644
--- a/drivers/video/matrox/matroxfb_crtc2.c
+++ b/drivers/video/matrox/matroxfb_crtc2.c
@@ -81,11 +81,11 @@ static void matroxfb_dh_restore(struct matroxfb_dh_fb_info* m2info,
         }
         tmp |= 0x00000001;      /* enable CRTC2 */
         datactl = 0;
-        if (ACCESS_FBINFO(outputs[1]).src == MATROXFB_SRC_CRTC2) {
-                if (ACCESS_FBINFO(devflags.g450dac)) {
+        if (minfo->outputs[1].src == MATROXFB_SRC_CRTC2) {
+                if (minfo->devflags.g450dac) {
                         tmp |= 0x00000006; /* source from secondary pixel PLL */
                         /* no vidrst when in monitor mode */
-                        if (ACCESS_FBINFO(outputs[1]).mode != MATROXFB_OUTPUT_MODE_MONITOR) {
+                        if (minfo->outputs[1].mode != MATROXFB_OUTPUT_MODE_MONITOR) {
                                 tmp |=  0xC0001000; /* Enable H/V vidrst */
                         }
                 } else {
@@ -93,11 +93,11 @@ static void matroxfb_dh_restore(struct matroxfb_dh_fb_info* m2info,
                         tmp |= 0xC0000000; /* enable vvidrst & hvidrst */
                         /* MGA TVO is our clock source */
                 }
-        } else if (ACCESS_FBINFO(outputs[0]).src == MATROXFB_SRC_CRTC2) {
+        } else if (minfo->outputs[0].src == MATROXFB_SRC_CRTC2) {
                 tmp |= 0x00000004; /* source from pixclock */
                 /* PIXPLL is our clock source */
         }
-        if (ACCESS_FBINFO(outputs[0]).src == MATROXFB_SRC_CRTC2) {
+        if (minfo->outputs[0].src == MATROXFB_SRC_CRTC2) {
                 tmp |= 0x00100000;      /* connect CRTC2 to DAC */
         }
         if (mt->interlaced) {
@@ -146,7 +146,7 @@ static void matroxfb_dh_restore(struct matroxfb_dh_fb_info* m2info,
                 }
         }
         mga_outl(0x3C10, tmp);
-        ACCESS_FBINFO(hw).crtc2.ctl = tmp;
+        minfo->hw.crtc2.ctl = tmp;
 
         tmp = mt->VDisplay << 16;       /* line compare */
         if (mt->sync & FB_SYNC_HOR_HIGH_ACT)
@@ -160,7 +160,7 @@ static void matroxfb_dh_disable(struct matroxfb_dh_fb_info* m2info) {
         MINFO_FROM(m2info->primary_dev);
 
         mga_outl(0x3C10, 0x00000004);   /* disable CRTC2, CRTC1->DAC1, PLL as clock source */
-        ACCESS_FBINFO(hw).crtc2.ctl = 0x00000004;
+        minfo->hw.crtc2.ctl = 0x00000004;
 }
 
 static void matroxfb_dh_pan_var(struct matroxfb_dh_fb_info* m2info,
@@ -262,13 +262,13 @@ static int matroxfb_dh_open(struct fb_info* info, int user) {
 #define m2info (container_of(info, struct matroxfb_dh_fb_info, fbcon))
         MINFO_FROM(m2info->primary_dev);
 
-        if (MINFO) {
+        if (minfo) {
                 int err;
 
-                if (ACCESS_FBINFO(dead)) {
+                if (minfo->dead) {
                         return -ENXIO;
                 }
-                err = ACCESS_FBINFO(fbops).fb_open(&ACCESS_FBINFO(fbcon), user);
+                err = minfo->fbops.fb_open(&minfo->fbcon, user);
                 if (err) {
                         return err;
                 }
@@ -282,8 +282,8 @@ static int matroxfb_dh_release(struct fb_info* info, int user) {
         int err = 0;
         MINFO_FROM(m2info->primary_dev);
 
-        if (MINFO) {
-                err = ACCESS_FBINFO(fbops).fb_release(&ACCESS_FBINFO(fbcon), user);
+        if (minfo) {
+                err = minfo->fbops.fb_release(&minfo->fbcon, user);
         }
         return err;
 #undef m2info
@@ -352,18 +352,18 @@ static int matroxfb_dh_set_par(struct fb_info* info) {
                 pos = (m2info->fbcon.var.yoffset * m2info->fbcon.var.xres_virtual + m2info->fbcon.var.xoffset) * m2info->fbcon.var.bits_per_pixel >> 3;
                 pos += m2info->video.offbase;
                 cnt = 0;
-                down_read(&ACCESS_FBINFO(altout).lock);
+                down_read(&minfo->altout.lock);
                 for (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) {
-                        if (ACCESS_FBINFO(outputs[out]).src == MATROXFB_SRC_CRTC2) {
+                        if (minfo->outputs[out].src == MATROXFB_SRC_CRTC2) {
                                 cnt++;
-                                if (ACCESS_FBINFO(outputs[out]).output->compute) {
-                                        ACCESS_FBINFO(outputs[out]).output->compute(ACCESS_FBINFO(outputs[out]).data, &mt);
+                                if (minfo->outputs[out].output->compute) {
+                                        minfo->outputs[out].output->compute(minfo->outputs[out].data, &mt);
                                 }
                         }
                 }
-                ACCESS_FBINFO(crtc2).pixclock = mt.pixclock;
-                ACCESS_FBINFO(crtc2).mnp = mt.mnp;
-                up_read(&ACCESS_FBINFO(altout).lock);
+                minfo->crtc2.pixclock = mt.pixclock;
+                minfo->crtc2.mnp = mt.mnp;
+                up_read(&minfo->altout.lock);
                 if (cnt) {
                         matroxfb_dh_restore(m2info, &mt, mode, pos);
                 } else {
@@ -371,20 +371,20 @@ static int matroxfb_dh_set_par(struct fb_info* info) {
                 }
                 DAC1064_global_init(PMINFO2);
                 DAC1064_global_restore(PMINFO2);
-                down_read(&ACCESS_FBINFO(altout).lock);
+                down_read(&minfo->altout.lock);
                 for (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) {
-                        if (ACCESS_FBINFO(outputs[out]).src == MATROXFB_SRC_CRTC2 &&
-                            ACCESS_FBINFO(outputs[out]).output->program) {
-                                ACCESS_FBINFO(outputs[out]).output->program(ACCESS_FBINFO(outputs[out]).data);
+                        if (minfo->outputs[out].src == MATROXFB_SRC_CRTC2 &&
+                            minfo->outputs[out].output->program) {
+                                minfo->outputs[out].output->program(minfo->outputs[out].data);
                         }
                 }
                 for (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) {
-                        if (ACCESS_FBINFO(outputs[out]).src == MATROXFB_SRC_CRTC2 &&
-                            ACCESS_FBINFO(outputs[out]).output->start) {
-                                ACCESS_FBINFO(outputs[out]).output->start(ACCESS_FBINFO(outputs[out]).data);
+                        if (minfo->outputs[out].src == MATROXFB_SRC_CRTC2 &&
+                            minfo->outputs[out].output->start) {
+                                minfo->outputs[out].output->start(minfo->outputs[out].data);
                         }
                 }
-                up_read(&ACCESS_FBINFO(altout).lock);
+                up_read(&minfo->altout.lock);
         }
         m2info->initialized = 1;
         return 0;
@@ -409,11 +409,11 @@ static int matroxfb_dh_get_vblank(const struct matroxfb_dh_fb_info* m2info, stru
         /* compatibility stuff */
         if (vblank->vcount >= m2info->fbcon.var.yres)
                 vblank->flags |= FB_VBLANK_VBLANKING;
-        if (test_bit(0, &ACCESS_FBINFO(irq_flags))) {
+        if (test_bit(0, &minfo->irq_flags)) {
                 vblank->flags |= FB_VBLANK_HAVE_COUNT;
                 /* Only one writer, aligned int value...
                    it should work without lock and without atomic_t */
-                vblank->count = ACCESS_FBINFO(crtc2).vsync.cnt;
+                vblank->count = minfo->crtc2.vsync.cnt;
         }
         return 0;
 }
@@ -455,7 +455,7 @@ static int matroxfb_dh_ioctl(struct fb_info *info,
                 case MATROXFB_GET_OUTPUT_MODE:
                 case MATROXFB_GET_ALL_OUTPUTS:
                         {
-                                return ACCESS_FBINFO(fbcon.fbops)->fb_ioctl(&ACCESS_FBINFO(fbcon), cmd, arg);
+                                return minfo->fbcon.fbops->fb_ioctl(&minfo->fbcon, cmd, arg);
                         }
                 case MATROXFB_SET_OUTPUT_CONNECTION:
                         {
@@ -469,9 +469,9 @@ static int matroxfb_dh_ioctl(struct fb_info *info,
                                         if (tmp & (1 << out)) {
                                                 if (out >= MATROXFB_MAX_OUTPUTS)
                                                         return -ENXIO;
-                                                if (!ACCESS_FBINFO(outputs[out]).output)
+                                                if (!minfo->outputs[out].output)
                                                         return -ENXIO;
-                                                switch (ACCESS_FBINFO(outputs[out]).src) {
+                                                switch (minfo->outputs[out].src) {
                                                         case MATROXFB_SRC_NONE:
                                                         case MATROXFB_SRC_CRTC2:
                                                                 break;
@@ -480,22 +480,22 @@ static int matroxfb_dh_ioctl(struct fb_info *info,
                                                 }
                                         }
                                 }
-                                if (ACCESS_FBINFO(devflags.panellink)) {
+                                if (minfo->devflags.panellink) {
                                         if (tmp & MATROXFB_OUTPUT_CONN_DFP)
                                                 return -EINVAL;
-                                        if ((ACCESS_FBINFO(outputs[2]).src == MATROXFB_SRC_CRTC1) && tmp)
+                                        if ((minfo->outputs[2].src == MATROXFB_SRC_CRTC1) && tmp)
                                                 return -EBUSY;
                                 }
                                 changes = 0;
                                 for (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) {
                                         if (tmp & (1 << out)) {
-                                                if (ACCESS_FBINFO(outputs[out]).src != MATROXFB_SRC_CRTC2) {
+                                                if (minfo->outputs[out].src != MATROXFB_SRC_CRTC2) {
                                                         changes = 1;
-                                                        ACCESS_FBINFO(outputs[out]).src = MATROXFB_SRC_CRTC2;
+                                                        minfo->outputs[out].src = MATROXFB_SRC_CRTC2;
                                                 }
-                                        } else if (ACCESS_FBINFO(outputs[out]).src == MATROXFB_SRC_CRTC2) {
+                                        } else if (minfo->outputs[out].src == MATROXFB_SRC_CRTC2) {
                                                 changes = 1;
-                                                ACCESS_FBINFO(outputs[out]).src = MATROXFB_SRC_NONE;
+                                                minfo->outputs[out].src = MATROXFB_SRC_NONE;
                                         }
                                 }
                                 if (!changes)
@@ -509,7 +509,7 @@ static int matroxfb_dh_ioctl(struct fb_info *info,
                                 int out;
 
                                 for (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) {
-                                        if (ACCESS_FBINFO(outputs[out]).src == MATROXFB_SRC_CRTC2) {
+                                        if (minfo->outputs[out].src == MATROXFB_SRC_CRTC2) {
                                                 conn |= 1 << out;
                                         }
                                 }
@@ -523,8 +523,8 @@ static int matroxfb_dh_ioctl(struct fb_info *info,
                                 int out;
 
                                 for (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) {
-                                        if (ACCESS_FBINFO(outputs[out]).output) {
-                                                switch (ACCESS_FBINFO(outputs[out]).src) {
+                                        if (minfo->outputs[out].output) {
+                                                switch (minfo->outputs[out].src) {
                                                         case MATROXFB_SRC_NONE:
                                                         case MATROXFB_SRC_CRTC2:
                                                                 tmp |= 1 << out;
@@ -532,9 +532,9 @@ static int matroxfb_dh_ioctl(struct fb_info *info,
                                                 }
                                         }
                                 }
-                                if (ACCESS_FBINFO(devflags.panellink)) {
+                                if (minfo->devflags.panellink) {
                                         tmp &= ~MATROXFB_OUTPUT_CONN_DFP;
-                                        if (ACCESS_FBINFO(outputs[2]).src == MATROXFB_SRC_CRTC1) {
+                                        if (minfo->outputs[2].src == MATROXFB_SRC_CRTC1) {
                                                 tmp = 0;
                                         }
                                 }
@@ -611,21 +611,21 @@ static int matroxfb_dh_regit(CPMINFO struct matroxfb_dh_fb_info* m2info) {
         if (mem < 64*1024)
                 mem *= 1024;
         mem &= ~0x00000FFF;     /* PAGE_MASK? */
-        if (ACCESS_FBINFO(video.len_usable) + mem <= ACCESS_FBINFO(video.len))
-                m2info->video.offbase = ACCESS_FBINFO(video.len) - mem;
-        else if (ACCESS_FBINFO(video.len) < mem) {
+        if (minfo->video.len_usable + mem <= minfo->video.len)
+                m2info->video.offbase = minfo->video.len - mem;
+        else if (minfo->video.len < mem) {
                 return -ENOMEM;
         } else { /* check yres on first head... */
                 m2info->video.borrowed = mem;
-                ACCESS_FBINFO(video.len_usable) -= mem;
-                m2info->video.offbase = ACCESS_FBINFO(video.len_usable);
+                minfo->video.len_usable -= mem;
+                m2info->video.offbase = minfo->video.len_usable;
         }
-        m2info->video.base = ACCESS_FBINFO(video.base) + m2info->video.offbase;
+        m2info->video.base = minfo->video.base + m2info->video.offbase;
         m2info->video.len = m2info->video.len_usable = m2info->video.len_maximum = mem;
-        m2info->video.vbase.vaddr = vaddr_va(ACCESS_FBINFO(video.vbase)) + m2info->video.offbase;
-        m2info->mmio.base = ACCESS_FBINFO(mmio.base);
-        m2info->mmio.vbase = ACCESS_FBINFO(mmio.vbase);
-        m2info->mmio.len = ACCESS_FBINFO(mmio.len);
+        m2info->video.vbase.vaddr = vaddr_va(minfo->video.vbase) + m2info->video.offbase;
+        m2info->mmio.base = minfo->mmio.base;
+        m2info->mmio.vbase = minfo->mmio.vbase;
+        m2info->mmio.len = minfo->mmio.len;
 
         matroxfb_dh_init_fix(m2info);
         if (register_framebuffer(&m2info->fbcon)) {
@@ -633,10 +633,10 @@ static int matroxfb_dh_regit(CPMINFO struct matroxfb_dh_fb_info* m2info) {
         }
         if (!m2info->initialized)
                 fb_set_var(&m2info->fbcon, &matroxfb_dh_defined);
-        down_write(&ACCESS_FBINFO(crtc2.lock));
-        oldcrtc2 = ACCESS_FBINFO(crtc2.info);
-        ACCESS_FBINFO(crtc2.info) = m2info;
-        up_write(&ACCESS_FBINFO(crtc2.lock));
+        down_write(&minfo->crtc2.lock);
+        oldcrtc2 = minfo->crtc2.info;
+        minfo->crtc2.info = m2info;
+        up_write(&minfo->crtc2.lock);
         if (oldcrtc2) {
                 printk(KERN_ERR "matroxfb_crtc2: Internal consistency check failed: crtc2 already present: %p\n",
                         oldcrtc2);
@@ -654,7 +654,7 @@ static int matroxfb_dh_registerfb(struct matroxfb_dh_fb_info* m2info) {
                 return -1;
         }
         printk(KERN_INFO "matroxfb_crtc2: secondary head of fb%u was registered as fb%u\n",
-                ACCESS_FBINFO(fbcon.node), m2info->fbcon.node);
+                minfo->fbcon.node, m2info->fbcon.node);
         m2info->fbcon_registered = 1;
         return 0;
 #undef minfo
@@ -666,11 +666,11 @@ static void matroxfb_dh_deregisterfb(struct matroxfb_dh_fb_info* m2info) {
                 int id;
                 struct matroxfb_dh_fb_info* crtc2;
 
-                down_write(&ACCESS_FBINFO(crtc2.lock));
-                crtc2 = ACCESS_FBINFO(crtc2.info);
+                down_write(&minfo->crtc2.lock);
+                crtc2 = minfo->crtc2.info;
                 if (crtc2 == m2info)
-                        ACCESS_FBINFO(crtc2.info) = NULL;
-                up_write(&ACCESS_FBINFO(crtc2.lock));
+                        minfo->crtc2.info = NULL;
+                up_write(&minfo->crtc2.lock);
                 if (crtc2 != m2info) {
                         printk(KERN_ERR "matroxfb_crtc2: Internal consistency check failed: crtc2 mismatch at unload: %p != %p\n",
                                 crtc2, m2info);
@@ -680,7 +680,7 @@ static void matroxfb_dh_deregisterfb(struct matroxfb_dh_fb_info* m2info) {
                 id = m2info->fbcon.node;
                 unregister_framebuffer(&m2info->fbcon);
                 /* return memory back to primary head */
-                ACCESS_FBINFO(video.len_usable) += m2info->video.borrowed;
+                minfo->video.len_usable += m2info->video.borrowed;
                 printk(KERN_INFO "matroxfb_crtc2: fb%u unregistered\n", id);
                 m2info->fbcon_registered = 0;
         }
@@ -691,14 +691,14 @@ static void* matroxfb_crtc2_probe(struct matrox_fb_info* minfo) {
         struct matroxfb_dh_fb_info* m2info;
 
         /* hardware is CRTC2 incapable... */
-        if (!ACCESS_FBINFO(devflags.crtc2))
+        if (!minfo->devflags.crtc2)
                 return NULL;
         m2info = kzalloc(sizeof(*m2info), GFP_KERNEL);
         if (!m2info) {
                 printk(KERN_ERR "matroxfb_crtc2: Not enough memory for CRTC2 control structs\n");
                 return NULL;
         }
-        m2info->primary_dev = MINFO;
+        m2info->primary_dev = minfo;
         if (matroxfb_dh_registerfb(m2info)) {
                 kfree(m2info);
                 printk(KERN_ERR "matroxfb_crtc2: CRTC2 framebuffer failed to register\n");