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, 56 insertions, 43 deletions

diff --git a/drivers/video/matrox/matroxfb_g450.c b/drivers/video/matrox/matroxfb_g450.c
index 841b439ecca3..f7f1343cd345 100644
--- a/drivers/video/matrox/matroxfb_g450.c
+++ b/drivers/video/matrox/matroxfb_g450.c
@@ -80,50 +80,57 @@ static int get_ctrl_id(__u32 v4l2_id) {
         return -EINVAL;
 }
 
-static inline int* get_ctrl_ptr(WPMINFO unsigned int idx) {
+static inline int *get_ctrl_ptr(struct matrox_fb_info *minfo, unsigned int idx)
+{
         return (int*)((char*)minfo + g450_controls[idx].control);
 }
 
-static void tvo_fill_defaults(WPMINFO2) {
+static void tvo_fill_defaults(struct matrox_fb_info *minfo)
+{
         unsigned int i;
         
         for (i = 0; i < G450CTRLS; i++) {
-                *get_ctrl_ptr(PMINFO i) = g450_controls[i].desc.default_value;
+                *get_ctrl_ptr(minfo, i) = g450_controls[i].desc.default_value;
         }
 }
 
-static int cve2_get_reg(WPMINFO int reg) {
+static int cve2_get_reg(struct matrox_fb_info *minfo, int reg)
+{
         unsigned long flags;
         int val;
         
         matroxfb_DAC_lock_irqsave(flags);
-        matroxfb_DAC_out(PMINFO 0x87, reg);
-        val = matroxfb_DAC_in(PMINFO 0x88);
+        matroxfb_DAC_out(minfo, 0x87, reg);
+        val = matroxfb_DAC_in(minfo, 0x88);
         matroxfb_DAC_unlock_irqrestore(flags);
         return val;
 }
 
-static void cve2_set_reg(WPMINFO int reg, int val) {
+static void cve2_set_reg(struct matrox_fb_info *minfo, int reg, int val)
+{
         unsigned long flags;
 
         matroxfb_DAC_lock_irqsave(flags);
-        matroxfb_DAC_out(PMINFO 0x87, reg);
-        matroxfb_DAC_out(PMINFO 0x88, val);
+        matroxfb_DAC_out(minfo, 0x87, reg);
+        matroxfb_DAC_out(minfo, 0x88, val);
         matroxfb_DAC_unlock_irqrestore(flags);
 }
 
-static void cve2_set_reg10(WPMINFO int reg, int val) {
+static void cve2_set_reg10(struct matrox_fb_info *minfo, int reg, int val)
+{
         unsigned long flags;
 
         matroxfb_DAC_lock_irqsave(flags);
-        matroxfb_DAC_out(PMINFO 0x87, reg);
-        matroxfb_DAC_out(PMINFO 0x88, val >> 2);
-        matroxfb_DAC_out(PMINFO 0x87, reg + 1);
-        matroxfb_DAC_out(PMINFO 0x88, val & 3);
+        matroxfb_DAC_out(minfo, 0x87, reg);
+        matroxfb_DAC_out(minfo, 0x88, val >> 2);
+        matroxfb_DAC_out(minfo, 0x87, reg + 1);
+        matroxfb_DAC_out(minfo, 0x88, val & 3);
         matroxfb_DAC_unlock_irqrestore(flags);
 }
 
-static void g450_compute_bwlevel(CPMINFO int *bl, int *wl) {
+static void g450_compute_bwlevel(const struct matrox_fb_info *minfo, int *bl,
+                                 int *wl)
+{
         const int b = minfo->altout.tvo_params.brightness + BLMIN;
         const int c = minfo->altout.tvo_params.contrast;
 
@@ -162,7 +169,7 @@ static int g450_set_ctrl(void* md, struct v4l2_control *p) {
         /*
          * Check if changed.
          */
-        if (p->value == *get_ctrl_ptr(PMINFO i)) return 0;
+        if (p->value == *get_ctrl_ptr(minfo, i)) return 0;
 
         /*
          * Check limits.
@@ -173,31 +180,31 @@ static int g450_set_ctrl(void* md, struct v4l2_control *p) {
         /*
          * Store new value.
          */
-        *get_ctrl_ptr(PMINFO i) = p->value;
+        *get_ctrl_ptr(minfo, i) = p->value;
 
         switch (p->id) {
                 case V4L2_CID_BRIGHTNESS:
                 case V4L2_CID_CONTRAST:
                         {
                                 int blacklevel, whitelevel;
-                                g450_compute_bwlevel(PMINFO &blacklevel, &whitelevel);
-                                cve2_set_reg10(PMINFO 0x0e, blacklevel);
-                                cve2_set_reg10(PMINFO 0x1e, whitelevel);
+                                g450_compute_bwlevel(minfo, &blacklevel, &whitelevel);
+                                cve2_set_reg10(minfo, 0x0e, blacklevel);
+                                cve2_set_reg10(minfo, 0x1e, whitelevel);
                         }
                         break;
                 case V4L2_CID_SATURATION:
-                        cve2_set_reg(PMINFO 0x20, p->value);
-                        cve2_set_reg(PMINFO 0x22, p->value);
+                        cve2_set_reg(minfo, 0x20, p->value);
+                        cve2_set_reg(minfo, 0x22, p->value);
                         break;
                 case V4L2_CID_HUE:
-                        cve2_set_reg(PMINFO 0x25, p->value);
+                        cve2_set_reg(minfo, 0x25, p->value);
                         break;
                 case MATROXFB_CID_TESTOUT:
                         {
-                                unsigned char val = cve2_get_reg (PMINFO 0x05);
+                                unsigned char val = cve2_get_reg(minfo, 0x05);
                                 if (p->value) val |=  0x02;
                                 else          val &= ~0x02;
-                                cve2_set_reg(PMINFO 0x05, val);
+                                cve2_set_reg(minfo, 0x05, val);
                         }
                         break;
         }
@@ -212,7 +219,7 @@ static int g450_get_ctrl(void* md, struct v4l2_control *p) {
         
         i = get_ctrl_id(p->id);
         if (i < 0) return -EINVAL;
-        p->value = *get_ctrl_ptr(PMINFO i);
+        p->value = *get_ctrl_ptr(minfo, i);
         return 0;
 }
 
@@ -226,7 +233,9 @@ struct output_desc {
         unsigned int    v_total;
 };
 
-static void computeRegs(WPMINFO struct mavenregs* r, struct my_timming* mt, const struct output_desc* outd) {
+static void computeRegs(struct matrox_fb_info *minfo, struct mavenregs *r,
+                        struct my_timming *mt, const struct output_desc *outd)
+{
         u_int32_t chromasc;
         u_int32_t hlen;
         u_int32_t hsl;
@@ -251,10 +260,10 @@ static void computeRegs(WPMINFO struct mavenregs* r, struct my_timming* mt, cons
 
         dprintk(KERN_DEBUG "Want %u kHz pixclock\n", (unsigned int)piic);
         
-        mnp = matroxfb_g450_setclk(PMINFO piic, M_VIDEO_PLL);
+        mnp = matroxfb_g450_setclk(minfo, piic, M_VIDEO_PLL);
         
         mt->mnp = mnp;
-        mt->pixclock = g450_mnp2f(PMINFO mnp);
+        mt->pixclock = g450_mnp2f(minfo, mnp);
 
         dprintk(KERN_DEBUG "MNP=%08X\n", mnp);
 
@@ -490,20 +499,22 @@ static void cve2_init_TVdata(int norm, struct mavenregs* data, const struct outp
         return;
 }
 
-#define LR(x) cve2_set_reg(PMINFO (x), m->regs[(x)])
-static void cve2_init_TV(WPMINFO const struct mavenregs* m) {
+#define LR(x) cve2_set_reg(minfo, (x), m->regs[(x)])
+static void cve2_init_TV(struct matrox_fb_info *minfo,
+                         const struct mavenregs *m)
+{
         int i;
 
         LR(0x80);
         LR(0x82); LR(0x83);
         LR(0x84); LR(0x85);
         
-        cve2_set_reg(PMINFO 0x3E, 0x01);
+        cve2_set_reg(minfo, 0x3E, 0x01);
         
         for (i = 0; i < 0x3E; i++) {
                 LR(i);
         }
-        cve2_set_reg(PMINFO 0x3E, 0x00);
+        cve2_set_reg(minfo, 0x3E, 0x00);
 }
 
 static int matroxfb_g450_compute(void* md, struct my_timming* mt) {
@@ -518,7 +529,7 @@ static int matroxfb_g450_compute(void* md, struct my_timming* mt) {
                 cve2_init_TVdata(minfo->outputs[1].mode, &minfo->hw.maven, &outd);
                 {
                         int blacklevel, whitelevel;
-                        g450_compute_bwlevel(PMINFO &blacklevel, &whitelevel);
+                        g450_compute_bwlevel(minfo, &blacklevel, &whitelevel);
                         minfo->hw.maven.regs[0x0E] = blacklevel >> 2;
                         minfo->hw.maven.regs[0x0F] = blacklevel & 3;
                         minfo->hw.maven.regs[0x1E] = whitelevel >> 2;
@@ -533,12 +544,12 @@ static int matroxfb_g450_compute(void* md, struct my_timming* mt) {
                                 minfo->hw.maven.regs[0x05] |= 0x02;
                         }
                 }
-                computeRegs(PMINFO &minfo->hw.maven, mt, outd);
+                computeRegs(minfo, &minfo->hw.maven, mt, outd);
         } else if (mt->mnp < 0) {
                 /* We must program clocks before CRTC2, otherwise interlaced mode
                    startup may fail */
-                mt->mnp = matroxfb_g450_setclk(PMINFO mt->pixclock, (mt->crtc == MATROXFB_SRC_CRTC1) ? M_PIXEL_PLL_C : M_VIDEO_PLL);
-                mt->pixclock = g450_mnp2f(PMINFO mt->mnp);
+                mt->mnp = matroxfb_g450_setclk(minfo, mt->pixclock, (mt->crtc == MATROXFB_SRC_CRTC1) ? M_PIXEL_PLL_C : M_VIDEO_PLL);
+                mt->pixclock = g450_mnp2f(minfo, mt->mnp);
         }
         dprintk(KERN_DEBUG "Pixclock = %u\n", mt->pixclock);
         return 0;
@@ -548,7 +559,7 @@ static int matroxfb_g450_program(void* md) {
         MINFO_FROM(md);
         
         if (minfo->outputs[1].mode != MATROXFB_OUTPUT_MODE_MONITOR) {
-                cve2_init_TV(PMINFO &minfo->hw.maven);
+                cve2_init_TV(minfo, &minfo->hw.maven);
         }
         return 0;
 }
@@ -567,8 +578,8 @@ static int g450_dvi_compute(void* md, struct my_timming* mt) {
         MINFO_FROM(md);
 
         if (mt->mnp < 0) {
-                mt->mnp = matroxfb_g450_setclk(PMINFO mt->pixclock, (mt->crtc == MATROXFB_SRC_CRTC1) ? M_PIXEL_PLL_C : M_VIDEO_PLL);
-                mt->pixclock = g450_mnp2f(PMINFO mt->mnp);
+                mt->mnp = matroxfb_g450_setclk(minfo, mt->pixclock, (mt->crtc == MATROXFB_SRC_CRTC1) ? M_PIXEL_PLL_C : M_VIDEO_PLL);
+                mt->pixclock = g450_mnp2f(minfo, mt->mnp);
         }
         return 0;
 }
@@ -588,10 +599,11 @@ static struct matrox_altout matroxfb_g450_dvi = {
         .compute        = g450_dvi_compute,
 };
 
-void matroxfb_g450_connect(WPMINFO2) {
+void matroxfb_g450_connect(struct matrox_fb_info *minfo)
+{
         if (minfo->devflags.g450dac) {
                 down_write(&minfo->altout.lock);
-                tvo_fill_defaults(PMINFO2);
+                tvo_fill_defaults(minfo);
                 minfo->outputs[1].src = minfo->outputs[1].default_src;
                 minfo->outputs[1].data = minfo;
                 minfo->outputs[1].output = &matroxfb_g450_altout;
@@ -604,7 +616,8 @@ void matroxfb_g450_connect(WPMINFO2) {
         }
 }
 
-void matroxfb_g450_shutdown(WPMINFO2) {
+void matroxfb_g450_shutdown(struct matrox_fb_info *minfo)
+{
         if (minfo->devflags.g450dac) {
                 down_write(&minfo->altout.lock);
                 minfo->outputs[1].src = MATROXFB_SRC_NONE;