matroxfb: get rid of unneeded macros WPMINFO and friends

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, 8 insertions, 6 deletions

diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c
index 8249959cde2e..f41d4b4f8e75 100644
--- a/drivers/video/matrox/matroxfb_crtc2.c
+++ b/drivers/video/matrox/matroxfb_crtc2.c
@@ -369,8 +369,8 @@ static int matroxfb_dh_set_par(struct fb_info* info) {
                 } else {
                         matroxfb_dh_disable(m2info);
                 }
-                DAC1064_global_init(PMINFO2);
-                DAC1064_global_restore(PMINFO2);
+                DAC1064_global_init(minfo);
+                DAC1064_global_restore(minfo);
                 down_read(&minfo->altout.lock);
                 for (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) {
                         if (minfo->outputs[out].src == MATROXFB_SRC_CRTC2 &&
@@ -401,7 +401,7 @@ static int matroxfb_dh_pan_display(struct fb_var_screeninfo* var, struct fb_info
 static int matroxfb_dh_get_vblank(const struct matroxfb_dh_fb_info* m2info, struct fb_vblank* vblank) {
         MINFO_FROM(m2info->primary_dev);
 
-        matroxfb_enable_irq(PMINFO 0);
+        matroxfb_enable_irq(minfo, 0);
         memset(vblank, 0, sizeof(*vblank));
         vblank->flags = FB_VBLANK_HAVE_VCOUNT | FB_VBLANK_HAVE_VBLANK;
         /* mask out reserved bits + field number (odd/even) */
@@ -449,7 +449,7 @@ static int matroxfb_dh_ioctl(struct fb_info *info,
 
                                 if (crt != 0)
                                         return -ENODEV;
-                                return matroxfb_wait_for_sync(PMINFO 1);
+                                return matroxfb_wait_for_sync(minfo, 1);
                         }
                 case MATROXFB_SET_OUTPUT_MODE:
                 case MATROXFB_GET_OUTPUT_MODE:
@@ -595,7 +595,9 @@ static struct fb_var_screeninfo matroxfb_dh_defined = {
                 0, {0,0,0,0,0}
 };
 
-static int matroxfb_dh_regit(CPMINFO struct matroxfb_dh_fb_info* m2info) {
+static int matroxfb_dh_regit(const struct matrox_fb_info *minfo,
+                             struct matroxfb_dh_fb_info *m2info)
+{
 #define minfo (m2info->primary_dev)
         void* oldcrtc2;
 
@@ -649,7 +651,7 @@ static int matroxfb_dh_regit(CPMINFO struct matroxfb_dh_fb_info* m2info) {
 
 static int matroxfb_dh_registerfb(struct matroxfb_dh_fb_info* m2info) {
 #define minfo (m2info->primary_dev)
-        if (matroxfb_dh_regit(PMINFO m2info)) {
+        if (matroxfb_dh_regit(minfo, m2info)) {
                 printk(KERN_ERR "matroxfb_crtc2: secondary head failed to register\n");
                 return -1;
         }