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

diff --git a/drivers/video/matrox/i2c-matroxfb.c b/drivers/video/matrox/i2c-matroxfb.c
index cefabe818a12..f3728ab262f8 100644
--- a/drivers/video/matrox/i2c-matroxfb.c
+++ b/drivers/video/matrox/i2c-matroxfb.c
@@ -41,7 +41,7 @@ static int matroxfb_read_gpio(struct matrox_fb_info* minfo) {
         int v;
 
         matroxfb_DAC_lock_irqsave(flags);
-        v = matroxfb_DAC_in(PMINFO DAC_XGENIODATA);
+        v = matroxfb_DAC_in(minfo, DAC_XGENIODATA);
         matroxfb_DAC_unlock_irqrestore(flags);
         return v;
 }
@@ -51,10 +51,10 @@ static void matroxfb_set_gpio(struct matrox_fb_info* minfo, int mask, int val) {
         int v;
 
         matroxfb_DAC_lock_irqsave(flags);
-        v = (matroxfb_DAC_in(PMINFO DAC_XGENIOCTRL) & mask) | val;
-        matroxfb_DAC_out(PMINFO DAC_XGENIOCTRL, v);
+        v = (matroxfb_DAC_in(minfo, DAC_XGENIOCTRL) & mask) | val;
+        matroxfb_DAC_out(minfo, DAC_XGENIOCTRL, v);
         /* We must reset GENIODATA very often... XFree plays with this register */
-        matroxfb_DAC_out(PMINFO DAC_XGENIODATA, 0x00);
+        matroxfb_DAC_out(minfo, DAC_XGENIODATA, 0x00);
         matroxfb_DAC_unlock_irqrestore(flags);
 }
 
@@ -149,8 +149,8 @@ static void* i2c_matroxfb_probe(struct matrox_fb_info* minfo) {
                 return NULL;
 
         matroxfb_DAC_lock_irqsave(flags);
-        matroxfb_DAC_out(PMINFO DAC_XGENIODATA, 0xFF);
-        matroxfb_DAC_out(PMINFO DAC_XGENIOCTRL, 0x00);
+        matroxfb_DAC_out(minfo, DAC_XGENIODATA, 0xFF);
+        matroxfb_DAC_out(minfo, DAC_XGENIOCTRL, 0x00);
         matroxfb_DAC_unlock_irqrestore(flags);
 
         switch (minfo->chip) {