kernel: Remove some unused variables in the serial drivers.

diff --git a/sys/dev/serial/cy/cy.c b/sys/dev/serial/cy/cy.c
index c2e435d..515e72a 100644 (file)
--- a/sys/dev/serial/cy/cy.c
+++ b/sys/dev/serial/cy/cy.c
@@ -815,14 +815,10 @@ sioclose(struct dev_close_args *ap)
 static void
 comhardclose(struct com_s *com)
 {
-       cy_addr         iobase;
        struct tty      *tp;
-       int             unit;
 
        ASSERT_LWKT_TOKEN_HELD(&tty_token);
 
-       unit = com->unit;
-       iobase = com->iobase;
        crit_enter();
 #if 0
        com->poll = FALSE;

diff --git a/sys/dev/serial/rp/rp.c b/sys/dev/serial/rp/rp.c
index b79d17c..1812337 100644 (file)
--- a/sys/dev/serial/rp/rp.c
+++ b/sys/dev/serial/rp/rp.c
@@ -1137,7 +1137,6 @@ rpclose(struct dev_close_args *ap)
        int     unit, mynor, umynor, port; /* SG */
        struct  rp_port *rp;
        struct  tty     *tp;
-       CHANNEL_t       *cp;
 
        lwkt_gettoken(&tty_token);
    umynor = (((minor(dev) >> 16) -1) * 32);    /* SG */
@@ -1150,7 +1149,6 @@ rpclose(struct dev_close_args *ap)
                return(0);
        }
        rp = rp_addr(unit) + port;
-       cp = &rp->rp_channel;
        tp = rp->rp_tty;
 
        crit_enter();
@@ -1176,14 +1174,12 @@ rpclose(struct dev_close_args *ap)
 static void
 rphardclose(struct rp_port *rp)
 {
-       int     mynor;
        struct  tty     *tp;
        CHANNEL_t       *cp;
 
        ASSERT_LWKT_TOKEN_HELD(&tty_token);
        cp = &rp->rp_channel;
        tp = rp->rp_tty;
-       mynor = MINOR_MAGIC(tp->t_dev);
 
        sFlushRxFIFO(cp);
        sFlushTxFIFO(cp);
@@ -1263,12 +1259,10 @@ rpioctl(struct dev_ioctl_args *ap)
        u_long cmd = ap->a_cmd;
        caddr_t data = ap->a_data;
        struct rp_port  *rp;
-       CHANNEL_t       *cp;
        struct tty      *tp;
        int     unit, mynor, port, umynor;            /* SG */
        int     error = 0;
        int     arg, flags, result, ChanStatus;
-       struct  termios *t;
 
        lwkt_gettoken(&tty_token);
    umynor = (((minor(dev) >> 16) -1) * 32);    /* SG */
@@ -1320,7 +1314,6 @@ rpioctl(struct dev_ioctl_args *ap)
        }
 
        tp = rp->rp_tty;
-       cp = &rp->rp_channel;
 
 #if defined(COMPAT_43) || defined(COMPAT_SUNOS)
        term = tp->t_termios;
@@ -1357,8 +1350,6 @@ rpioctl(struct dev_ioctl_args *ap)
                        dt->c_ospeed = tp->t_ospeed;
        }
 
-       t = &tp->t_termios;
-
        error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data,
                                              ap->a_fflag, ap->a_cred);
        if(error != ENOIOCTL) {
@@ -1641,7 +1632,6 @@ rpstart(struct tty *tp)
        CHANNEL_t       *cp;
        struct  clist   *qp;
        int     unit, mynor, port, umynor;               /* SG */
-       char    flags;
        int     xmit_fifo_room;
        int     count, wcount;
 
@@ -1653,7 +1643,6 @@ rpstart(struct tty *tp)
        unit = minor_to_unit[mynor];
        rp = rp_addr(unit) + port;
        cp = &rp->rp_channel;
-       flags = rp->rp_channel.TxControl[3];
        crit_enter();
 
        if(tp->t_state & (TS_TIMEOUT | TS_TTSTOP)) {

diff --git a/sys/dev/serial/rp/rp_isa.c b/sys/dev/serial/rp/rp_isa.c
index 2919b15..e1c1339 100644 (file)
--- a/sys/dev/serial/rp/rp_isa.c
+++ b/sys/dev/serial/rp/rp_isa.c
@@ -220,14 +220,11 @@ nogo:
 static int
 rp_attach(device_t dev)
 {
-       int     unit;
        int     num_ports, num_aiops;
        int     aiop;
        CONTROLLER_t    *ctlp;
        int     retval;
 
-       unit = device_get_unit(dev);
-
        ctlp = device_get_softc(dev);
 
 #if 0 /* notdef */

diff --git a/sys/dev/serial/rp/rp_pci.c b/sys/dev/serial/rp/rp_pci.c
index a0384d1..7bc0bd6 100644 (file)
--- a/sys/dev/serial/rp/rp_pci.c
+++ b/sys/dev/serial/rp/rp_pci.c
@@ -131,14 +131,12 @@ rp_pciattach(device_t dev)
        int     num_ports, num_aiops;
        int     aiop;
        CONTROLLER_t    *ctlp;
-       int     unit;
        int     retval;
        u_int32_t       stcmd;
 
        ctlp = device_get_softc(dev);
        bzero(ctlp, sizeof(*ctlp));
        ctlp->dev = dev;
-       unit = device_get_unit(dev);
        ctlp->aiop2rid = rp_pci_aiop2rid;
        ctlp->aiop2off = rp_pci_aiop2off;
        ctlp->ctlmask = rp_pci_ctlmask;

diff --git a/sys/dev/serial/sio/sio.c b/sys/dev/serial/sio/sio.c
index 21aacf9..d814a31 100644 (file)
--- a/sys/dev/serial/sio/sio.c
+++ b/sys/dev/serial/sio/sio.c
@@ -1464,9 +1464,6 @@ static void
 comhardclose(struct com_s *com)
 {
        struct tty      *tp;
-       int             unit;
-
-       unit = com->unit;
        crit_enter();
        lwkt_gettoken(&tty_token);
        com->poll = FALSE;

diff --git a/sys/dev/serial/stl/stallion.c b/sys/dev/serial/stl/stallion.c
index ede5ef7..2366ff3 100644 (file)
--- a/sys/dev/serial/stl/stallion.c
+++ b/sys/dev/serial/stl/stallion.c
@@ -1920,15 +1920,12 @@ static void stl_ttyoptim(stlport_t *portp, struct termios *tiosp)
 static int stl_initports(stlbrd_t *brdp, stlpanel_t *panelp)
 {
        stlport_t       *portp;
-       unsigned int    chipmask;
        int             i, j;
 
 #if STLDEBUG
        kprintf("stl_initports(panelp=%x)\n", (int) panelp);
 #endif
 
-        chipmask = stl_panelinit(brdp, panelp);
-
 /*
  *      All UART's are initialized if found. Now go through and setup
  *      each ports data structures. Also initialize each individual
@@ -2556,7 +2553,6 @@ static void stl_cd1400ccrwait(stlport_t *portp)
 
 static __inline void stl_cd1400txisr(stlpanel_t *panelp, int ioaddr)
 {
-        struct tty      *tp;
         stlport_t       *portp;
         unsigned char   ioack, srer;
         char            *head, *tail;
@@ -2574,7 +2570,6 @@ static __inline void stl_cd1400txisr(stlpanel_t *panelp, int ioaddr)
                 return;
         }
         portp = panelp->ports[(ioack >> 3)];
-        tp = &portp->tty;
 
 /*
  *      Unfortunately we need to handle breaks in the data stream, since