From: Harvey Harrison Date: Wed, 30 Apr 2008 07:53:52 +0000 (-0700) Subject: epca.c: static functions and integer as NULL pointer fixes X-Git-Tag: v2.6.26-rc1~208 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=11fb09bfabd699a94555b69d6e6c4fa6c3febde8;p=linux-2.6-omap-h63xx.git epca.c: static functions and integer as NULL pointer fixes drivers/char/epca.c:926:28: warning: Using plain integer as NULL pointer drivers/char/epca.c:1841:2: warning: Using plain integer as NULL pointer Forward declarations were already marked static, mark the definitions too. drivers/char/epca.c:2493:6: warning: symbol 'digi_send_break' was not declared. Should it be static? drivers/char/epca.c:2881:12: warning: symbol 'init_PCI' was not declared. Should it be static? [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Harvey Harrison Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/char/epca.c b/drivers/char/epca.c index 9a682851283..37d4dca5a5d 100644 --- a/drivers/char/epca.c +++ b/drivers/char/epca.c @@ -923,7 +923,8 @@ static int pc_open(struct tty_struct *tty, struct file * filp) return(-ENODEV); } - if ((bc = ch->brdchan) == 0) { + bc = ch->brdchan; + if (bc == NULL) { tty->driver_data = NULL; return -ENODEV; } @@ -1838,7 +1839,7 @@ static void epcaparam(struct tty_struct *tty, struct channel *ch) unsigned mval, hflow, cflag, iflag; bc = ch->brdchan; - epcaassert(bc !=0, "bc out of range"); + epcaassert(bc != NULL, "bc out of range"); assertgwinon(ch); ts = tty->termios; @@ -2477,7 +2478,7 @@ static void pc_unthrottle(struct tty_struct *tty) } } -void digi_send_break(struct channel *ch, int msec) +static void digi_send_break(struct channel *ch, int msec) { unsigned long flags; @@ -2865,7 +2866,7 @@ static struct pci_device_id epca_pci_tbl[] = { MODULE_DEVICE_TABLE(pci, epca_pci_tbl); -int __init init_PCI (void) +static int __init init_PCI(void) { memset (&epca_driver, 0, sizeof (epca_driver)); epca_driver.name = "epca";