Clean up -Wunused warnings.

Reviewed by:	 Greg Ungerer <gerg@stallion.oz.au>

2 files changed, 14 insertions, 18 deletions

diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c
index 56462a5..bfe605e 100644
--- a/sys/i386/isa/istallion.c
+++ b/sys/i386/isa/istallion.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $Id: istallion.c,v 1.2 1996/05/04 08:49:40 peter Exp $
  */
 
 /*****************************************************************************/
@@ -142,9 +142,9 @@
  *	Define our local driver identity first. Set up stuff to deal with
  *	all the local structures required by a serial tty driver.
  */
-static char	*stli_drvname = "stli";
-static char	*stli_longdrvname = "Stallion Multiport Serial Driver";
-static char	*stli_drvversion = "0.0.5";
+static char 		stli_drvname[] = "stli";
+static char const	stli_longdrvname[] = "Stallion Multiport Serial Driver";
+static char const	stli_drvversion[] = "0.0.5";
 
 static int	stli_nrbrds = 0;
 static int	stli_doingtimeout = 0;
@@ -632,7 +632,7 @@ static char	*stli_stalgetmemptr(stlibrd_t *brdp, unsigned long offset,
  *	Declare the driver isa structure.
  */
 struct isa_driver	stlidriver = {
-	stliprobe, stliattach, "stli"
+	stliprobe, stliattach, stli_drvname
 };
 
 /*****************************************************************************/
@@ -648,7 +648,7 @@ struct isa_driver	stlidriver = {
 static struct cdevsw stli_cdevsw = 
 	{ stliopen,	stliclose,	stliread,	stliwrite,
 	  stliioctl,	stlistop,	noreset,	stlidevtotty,
-	  ttselect,	nommap,		NULL,		"stli",
+	  ttselect,	nommap,		NULL,		stli_drvname,
 	  NULL,		-1 };
 
 static stli_devsw_installed = 0;
@@ -933,7 +933,6 @@ int stliattach(struct isa_device *idp)
 STATIC int stliopen(dev_t dev, int flag, int mode, struct proc *p)
 {
 	struct tty	*tp;
-	stlibrd_t	*brdp;
 	stliport_t	*portp;
 	int		error, callout, x;
 
diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c
index bedd0c3..7a8805f 100644
--- a/sys/i386/isa/stallion.c
+++ b/sys/i386/isa/stallion.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $Id: stallion.c,v 1.2 1996/05/04 08:44:42 peter Exp $
  */
 
 /*****************************************************************************/
@@ -143,15 +143,15 @@ static unsigned int	stl_irqshared = 0;
  *	Define our local driver identity first. Set up stuff to deal with
  *	all the local structures required by a serial tty driver.
  */
-static char	*stl_drvname = "stl";
-static char	*stl_longdrvname = "Stallion Multiport Serial Driver";
-static char	*stl_drvversion = "0.0.5";
-static int	stl_brdprobed[STL_MAXBRDS];
+static const char	stl_drvname[] = "stl";
+static const char	stl_longdrvname[] = "Stallion Multiport Serial Driver";
+static const char	stl_drvversion[] = "0.0.5";
+static int		stl_brdprobed[STL_MAXBRDS];
 
-static int	stl_nrbrds = 0;
-static int	stl_doingtimeout = 0;
+static int		stl_nrbrds = 0;
+static int		stl_doingtimeout = 0;
 
-static char	*__file__ = /*__FILE__*/ "stallion.c";
+static const char 	__file__[] = /*__FILE__*/ "stallion.c";
 
 /*
  *	Define global stats structures. Not used often, and can be
@@ -703,7 +703,6 @@ char *stlpciprobe(pcici_t tag, pcidi_t type)
 void stlpciattach(pcici_t tag, int unit)
 {
 	stlbrd_t	*brdp;
-	unsigned long	iobase, iopage, irq;
 
 #if DEBUG
 	printf("stlpciattach(tag=%x,unit=%x)\n", (int) &tag, unit);
@@ -3057,8 +3056,6 @@ static int stl_getportstats(stlport_t *portp, caddr_t data)
 
 static int stl_clrportstats(stlport_t *portp, caddr_t data)
 {
-	int	rc;
-
 	if (portp == (stlport_t *) NULL) {
 		stl_comstats = *((comstats_t *) data);
 		portp = stl_getport(stl_comstats.brd, stl_comstats.panel,