xserver/hw/kdrive/pm2 pm2.c,1.3,1.4 pm2stub.c,1.1,1.2

Committed by: anholt

Update of /cvs/xserver/xserver/hw/kdrive/pm2
In directory gabe:/tmp/cvs-serv11124/hw/kdrive/pm2

Modified Files:
	pm2.c pm2stub.c 
Log Message:
Perform a warnings sweep on hw/kdrive.  A number of these were my fault,
but some come from others.


Index: pm2.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/pm2/pm2.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pm2.c	9 Jun 2005 10:44:45 -0000	1.3
+++ pm2.c	9 Jun 2005 23:22:54 -0000	1.4
@@ -49,7 +49,7 @@
 	             -1,              -1,              -1,              -1,
 		     0};
 
-Bool
+static Bool
 pmMapReg(KdCardInfo *card, PM2CardInfo *pm2c)
 {
 	pm2c->reg_base = (CARD8 *)KdMapDevice(PM2_REG_BASE(card),
@@ -64,7 +64,7 @@
 	return TRUE;
 }
 
-void
+static void
 pmUnmapReg(KdCardInfo *card, PM2CardInfo *pm2c)
 {
 	if (pm2c->reg_base) {
@@ -78,8 +78,6 @@
 Bool
 pmCardInit (KdCardInfo *card)
 {
-    int i;
-
     PM2CardInfo	*pm2c;
 
     pm2c = (PM2CardInfo *) xalloc (sizeof (PM2CardInfo));
@@ -102,7 +100,7 @@
     return TRUE;
 }
 
-void
+static  void
 pmCardFini (KdCardInfo *card)
 {
     PM2CardInfo	*pm2c = (PM2CardInfo *) card->driver;
@@ -176,7 +174,7 @@
     return TRUE;
 }
 
-void
+static void
 pmScreenFini (KdScreenInfo *screen)
 {
     PM2ScreenInfo	*pm2s = (PM2ScreenInfo *) screen->driver;
@@ -186,7 +184,7 @@
     screen->driver = 0;
 }
 
-Bool
+static Bool
 pmInitScreen (ScreenPtr pScreen)
 {
     return vesaInitScreen (pScreen);
@@ -216,7 +214,7 @@
 }
 #endif
 
-Bool
+static Bool
 pmFinishInitScreen (ScreenPtr pScreen)
 {
     Bool    ret;
@@ -227,7 +225,7 @@
     return ret;
 }
 
-void
+static void
 pmPreserve(KdCardInfo *card)
 {
     vesaPreserve(card);
@@ -236,17 +234,12 @@
 static void
 pmRestore(KdCardInfo *card)
 {
-    PM2CardInfo	*pm2c = card->driver;
-
     vesaRestore (card);
 }
 
-Bool
+static Bool
 pmEnable (ScreenPtr pScreen)
 {
-    KdScreenPriv(pScreen);
-    PM2CardInfo	*pm2c = pScreenPriv->card->driver;
-
     if (!vesaEnable (pScreen))
 	return FALSE;
     
@@ -257,12 +250,9 @@
     return TRUE;
 }
 
-void
+static void
 pmDisable(ScreenPtr pScreen)
 {
-    KdScreenPriv(pScreen);
-    PM2CardInfo	*pm2c = pScreenPriv->card->driver;
-
 #ifdef XV
     KdXVDisable (pScreen);
 #endif

Index: pm2stub.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/pm2/pm2stub.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pm2stub.c	24 May 2004 19:31:41 -0000	1.1
+++ pm2stub.c	9 Jun 2005 23:22:54 -0000	1.2
@@ -2,6 +2,7 @@
 #include <config.h>
 #endif
 #include "kdrive.h"
+#include "klinux.h"
 
 #include "pm2.h"
 
@@ -16,8 +17,6 @@
     KdCardAttr	attr;
     int		i;
 
-    Bool LinuxFindPci(CARD16, CARD16, CARD32, KdCardAttr *); 
-
     for (i = 0; i < numPM2Cards; i++)
 	if (LinuxFindPci (0x3d3d, PM2Cards[i], 0, &attr))
 	    KdCardInfoAdd (&PM2Funcs, &attr, (void *) PM2Cards[i]);