diff options
| author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-30 03:53:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 11:29:44 -0400 |
| commit | 11fb09bfabd699a94555b69d6e6c4fa6c3febde8 (patch) | |
| tree | 8ec235bfcb19ed81477b724a8f00441796b252ab | |
| parent | 1a4e2351e7fcf2d10bb5524b0ace7797ffad4d98 (diff) | |
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 <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/char/epca.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/char/epca.c b/drivers/char/epca.c index 9a682851283e..37d4dca5a5d4 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) | |||
| 923 | return(-ENODEV); | 923 | return(-ENODEV); |
| 924 | } | 924 | } |
| 925 | 925 | ||
| 926 | if ((bc = ch->brdchan) == 0) { | 926 | bc = ch->brdchan; |
| 927 | if (bc == NULL) { | ||
| 927 | tty->driver_data = NULL; | 928 | tty->driver_data = NULL; |
| 928 | return -ENODEV; | 929 | return -ENODEV; |
| 929 | } | 930 | } |
| @@ -1838,7 +1839,7 @@ static void epcaparam(struct tty_struct *tty, struct channel *ch) | |||
| 1838 | unsigned mval, hflow, cflag, iflag; | 1839 | unsigned mval, hflow, cflag, iflag; |
| 1839 | 1840 | ||
| 1840 | bc = ch->brdchan; | 1841 | bc = ch->brdchan; |
| 1841 | epcaassert(bc !=0, "bc out of range"); | 1842 | epcaassert(bc != NULL, "bc out of range"); |
| 1842 | 1843 | ||
| 1843 | assertgwinon(ch); | 1844 | assertgwinon(ch); |
| 1844 | ts = tty->termios; | 1845 | ts = tty->termios; |
| @@ -2477,7 +2478,7 @@ static void pc_unthrottle(struct tty_struct *tty) | |||
| 2477 | } | 2478 | } |
| 2478 | } | 2479 | } |
| 2479 | 2480 | ||
| 2480 | void digi_send_break(struct channel *ch, int msec) | 2481 | static void digi_send_break(struct channel *ch, int msec) |
| 2481 | { | 2482 | { |
| 2482 | unsigned long flags; | 2483 | unsigned long flags; |
| 2483 | 2484 | ||
| @@ -2865,7 +2866,7 @@ static struct pci_device_id epca_pci_tbl[] = { | |||
| 2865 | 2866 | ||
| 2866 | MODULE_DEVICE_TABLE(pci, epca_pci_tbl); | 2867 | MODULE_DEVICE_TABLE(pci, epca_pci_tbl); |
| 2867 | 2868 | ||
| 2868 | int __init init_PCI (void) | 2869 | static int __init init_PCI(void) |
| 2869 | { | 2870 | { |
| 2870 | memset (&epca_driver, 0, sizeof (epca_driver)); | 2871 | memset (&epca_driver, 0, sizeof (epca_driver)); |
| 2871 | epca_driver.name = "epca"; | 2872 | epca_driver.name = "epca"; |
