Char: stallion, variables cleanup
PATCH 5/6 Char: stallion, variables cleanup
stallion, variables cleanup
- fix `gcc -W' un/signed warnings by converting some ints -> uints.
- move 3 global variables into functions, where are they used.
Signed-off-by Jiri Slaby <[email protected]>
---
commit 4f8d6cfde402d83afad0231d03bfa721fb6b8589
tree 08f9a548544ec0c8aa4c96f39ec5e9e4f90c2eb6
parent 02cadc8f971f2cb43ed58957092eea50ef359314
author Jiri Slaby <[email protected]> Thu, 02 Nov 2006 23:17:12 +0100 committer Jiri Slaby <[email protected]> Thu, 02 Nov 2006 23:17:12 +0100
drivers/char/stallion.c | 67 +++++++++++++++++++++------------------------- include/linux/stallion.h | 28 ++++++++++--------- 2 files changed, 45 insertions(+), 50 deletions(-)
drivers/char/stallion.c +31 -36
@@ -63,7 +63,7 @@ #define BRD_ECH64PCI 27#define BRD_EASYIOPCI 28struct stlconf { -int brdtype; +unsigned int brdtype;int ioaddr1;int ioaddr2;unsigned long memaddr;
@@ -121,15 +121,6 @@ static struct ktermios stl_deftermios = };/* -* Define global stats structures. Not used often, and can be -* re-used for each stats call. -*/ -static comstats_t stl_comstats; -static combrd_t stl_brdstats; -static struct stlbrd stl_dummybrd; -static struct stlport stl_dummyport; - -/* * Define global place to put buffer overflow characters. */ static char stl_unwanted[SC26198_RXFIFOSIZE ];
@@ -200,7 +191,7 @@ static char *stl_brdnames[] = {* load line. These allow for easy board definitions, and easy * modification of the io, memory and irq resoucres. */ -static int stl_nargs =0 ; +static unsigned int stl_nargs;static char *board0[4 ];static char *board1[4 ];static char *board2[4 ];
@@ -632,7 +623,7 @@ static struct class *stallion_class;static int __init stl_parsebrd (struct stlconf *confp,char **argp) {char *sp; -int i; +unsigned int i;pr_debug ("stl_parsebrd(confp=%p,argp=%p)\n" , confp, argp);
@@ -694,8 +685,8 @@ static int stl_open(struct tty_struct *t {struct stlport *portp;struct stlbrd *brdp; -unsigned int minordev; -int brdnr, panelnr, portnr, rc; +unsigned int minordev, brdnr, panelnr; +int portnr, rc;pr_debug ("stl_open(tty=%p,filp=%p): device=%s\n" , tty, filp, tty->name);
@@ -1556,8 +1547,8 @@ static int stl_readproc(char *page, charstruct stlbrd *brdp;struct stlpanel *panelp;struct stlport *portp; -int brdnr, panelnr, portnr, totalport; -int curoff, maxoff; +unsigned int brdnr, panelnr, portnr; +int totalport, curoff, maxoff;char *pos; pr_debug("stl_readproc(page=%p,start=%p,off=%lx,count=%d,eof=%p,"
@@ -1675,8 +1666,7 @@ static int stl_eiointr(struct stlbrd *brstatic int stl_echatintr (struct stlbrd *brdp) {struct stlpanel *panelp; -unsigned int ioaddr; -int bnknr; +unsigned int ioaddr, bnknr;int handled =0 ;outb ((brdp->ioctrlval |ECH_BRDENABLE ), brdp->ioctrl);
@@ -1706,8 +1696,7 @@ static int stl_echatintr(struct stlbrd *static int stl_echmcaintr (struct stlbrd *brdp) {struct stlpanel *panelp; -unsigned int ioaddr; -int bnknr; +unsigned int ioaddr, bnknr;int handled =0 ;while (inb (brdp->iostatus) &ECH_INTRPEND ) {
@@ -1732,8 +1721,7 @@ static int stl_echmcaintr(struct stlbrdstatic int stl_echpciintr (struct stlbrd *brdp) {struct stlpanel *panelp; -unsigned int ioaddr; -int bnknr, recheck; +unsigned int ioaddr, bnknr, recheck;int handled =0 ;while (1 ) {
@@ -1763,8 +1751,7 @@ static int stl_echpciintr(struct stlbrdstatic int stl_echpci64intr (struct stlbrd *brdp) {struct stlpanel *panelp; -unsigned int ioaddr; -int bnknr; +unsigned int ioaddr, bnknr;int handled =0 ;while (inb (brdp->ioctrl) &0x1 ) {
@@ -1828,8 +1815,9 @@ static void stl_offintr(void *private)static int __devinit stl_initports (struct stlbrd *brdp,struct stlpanel *panelp) { -struct stlport *portp; -int chipmask, i; +struct stlport *portp; +unsigned int i; +int chipmask;pr_debug ("stl_initports(brdp=%p,panelp=%p)\n" , brdp, panelp);
@@ -2054,8 +2042,8 @@ err:static int __devinit stl_initech (struct stlbrd *brdp) {struct stlpanel *panelp; -unsigned int status, nxtid, ioaddr, conflict; -int panelnr, banknr, i, retval; +unsigned int status, nxtid, ioaddr, conflict, panelnr, banknr, i; +int retval;char *name;pr_debug ("stl_initech(brdp=%p)\n" , brdp);
@@ -2339,7 +2327,7 @@ err:static int __devinit stl_getbrdnr (void ) { -int i; +unsigned int i;for (i =0 ; i <STL_MAXBRDS ; i++)if (stl_brds[i] ==NULL ) {
@@ -2363,7 +2351,7 @@ static int __devinit stl_pciprobe(struct {struct stlbrd *brdp;unsigned int brdtype = ent->driver_data; -int retval = -ENODEV ; +int brdnr, retval = -ENODEV ;if ((pdev->class >>8 ) ==PCI_CLASS_STORAGE_IDE ) goto err;
@@ -2380,13 +2368,14 @@ static int __devinit stl_pciprobe(struct goto err; }mutex_lock (&stl_brdslock); - brdp->brdnr =stl_getbrdnr (); -if (brdp->brdnr <0 ) { + brdnr =stl_getbrdnr (); +if (brdnr <0 ) {dev_err (&pdev->dev,"too many boards found, " "maximum supported %d\n" ,STL_MAXBRDS );mutex_unlock (&stl_brdslock); goto err_fr; } + brdp->brdnr = (unsigned int )brdnr; stl_brds[brdp->brdnr] = brdp;mutex_unlock (&stl_brdslock);
@@ -2462,9 +2451,10 @@ static struct pci_driver stl_pcidriver =static int stl_getbrdstats (combrd_t __user *bp) { +combrd_t stl_brdstats;struct stlbrd *brdp;struct stlpanel *panelp; -int i; +unsigned int i;if (copy_from_user (&stl_brdstats, bp,sizeof (combrd_t)))return -EFAULT ;
@@ -2510,12 +2500,12 @@ static struct stlport *stl_getport(int b brdp = stl_brds[brdnr];if (brdp ==NULL )return NULL ; -if (panelnr <0 || panelnr >= brdp->nrpanels) +if (panelnr <0 || (unsigned int )panelnr >= brdp->nrpanels)return NULL ; panelp = brdp->panels[panelnr];if (panelp ==NULL )return NULL ; -if (portnr <0 || portnr >= panelp->nrports) +if (portnr <0 || (unsigned int )portnr >= panelp->nrports)return NULL ;return panelp->ports[portnr]; }
@@ -2530,6 +2520,7 @@ static struct stlport *stl_getport(int bstatic int stl_getportstats (struct stlport *portp,comstats_t __user *cp) { +comstats_t stl_comstats;unsigned char *head, *tail;unsigned long flags;
@@ -2587,6 +2578,8 @@ static int stl_getportstats(struct stlpostatic int stl_clrportstats (struct stlport *portp,comstats_t __user *cp) { +comstats_t stl_comstats; +if (!portp) {if (copy_from_user (&stl_comstats, cp,sizeof (comstats_t)))return -EFAULT ;
@@ -2612,6 +2605,7 @@ static int stl_clrportstats(struct stlpostatic int stl_getportstruct (struct stlport __user *arg) { +struct stlport stl_dummyport;struct stlport *portp;if (copy_from_user (&stl_dummyport, arg,sizeof (struct stlport )))
@@ -2631,11 +2625,12 @@ static int stl_getportstruct(struct stlpstatic int stl_getbrdstruct (struct stlbrd __user *arg) { +struct stlbrd stl_dummybrd;struct stlbrd *brdp;if (copy_from_user (&stl_dummybrd, arg,sizeof (struct stlbrd )))return -EFAULT ; -if ((stl_dummybrd.brdnr <0 ) || (stl_dummybrd.brdnr >=STL_MAXBRDS )) +if (stl_dummybrd.brdnr >=STL_MAXBRDS )return -ENODEV ; brdp = stl_brds[stl_dummybrd.brdnr];if (!brdp)
include/linux/stallion.h +14 -14
@@ -69,12 +69,12 @@ struct stlrq {*/ struct stlport {unsigned long magic; -int portnr; -int panelnr; -int brdnr; +unsigned int portnr; +unsigned int panelnr; +unsigned int brdnr;int ioaddr;int uartaddr; -int pagenr; +unsigned int pagenr;long istate;int flags;int baud_base;
@@ -102,10 +102,10 @@ struct stlport {struct stlpanel {unsigned long magic; -int panelnr; -int brdnr; -int pagenr; -int nrports; +unsigned int panelnr; +unsigned int brdnr; +unsigned int pagenr; +unsigned int nrports;int iobase;void *uartp;void (*isr)(struct stlpanel *panelp,unsigned int iobase);
@@ -116,12 +116,12 @@ struct stlpanel {struct stlbrd {unsigned long magic; -int brdnr; -int brdtype; -int state; -int nrpanels; -int nrports; -int nrbnks; +unsigned int brdnr; +unsigned int brdtype; +unsigned int state; +unsigned int nrpanels; +unsigned int nrports; +unsigned int nrbnks;int irq;int irqtype;int (*isr)(struct stlbrd *brdp);