From 0ecb7060a7353b7ce8c2a5db64c555885ff344b0 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 13 Aug 2006 10:58:42 +0200 Subject: [GCC4] fix build error in drivers/char/tpqic02.c This patch fixes these errors with gcc 4 : tpqic02.c: In function 'tp_sense': tpqic02.c:823: error: invalid storage class for function 'finish_rw' tpqic02.c:834: warning: implicit declaration of function 'finish_rw' tpqic02.c: At top level: tpqic02.c:1110: warning: conflicting types for 'finish_rw' tpqic02.c:1110: error: static declaration of 'finish_rw' follows non-static declaration tpqic02.c:834: error: previous implicit declaration of 'finish_rw' was here tpqic02.c: In function 'qic02_tape_open': tpqic02.c:2179: error: invalid storage class for function 'qic02_tape_open_no_use_count' tpqic02.c:2182: warning: implicit declaration of function 'qic02_tape_open_no_use_count' tpqic02.c: At top level: tpqic02.c:2188: error: static declaration of 'qic02_tape_open_no_use_count' follows non-static declaration tpqic02.c:2182: error: previous implicit declaration of 'qic02_tape_open_no_use_count' was here --- drivers/char/tpqic02.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/char/tpqic02.c b/drivers/char/tpqic02.c index d694f43..f9d5742 100644 --- a/drivers/char/tpqic02.c +++ b/drivers/char/tpqic02.c @@ -202,6 +202,7 @@ static int mode_access; /* access mode: static int qic02_get_resources(void); static void qic02_release_resources(void); +static void finish_rw(int cmd); /* This is a pointer to the actual kernel buffer where the interrupt routines * read from/write to. It is needed because the DMA channels 1 and 3 cannot @@ -820,7 +821,6 @@ #endif static int tp_sense(int ignore) { unsigned err = 0, exnr = 0, gs = 0; - static void finish_rw(int cmd); if (TPQDBG(SENSE_TEXT)) printk(TPQIC02_NAME ": tp_sense(ignore=0x%x) enter\n", @@ -2173,16 +2173,6 @@ static ssize_t qic02_tape_write(struct f * Don't rewind if the minor bits specify density 0. */ -static int qic02_tape_open(struct inode *inode, struct file *filp) -{ - static int qic02_tape_open_no_use_count(struct inode *, - struct file *); - int open_error; - - open_error = qic02_tape_open_no_use_count(inode, filp); - return open_error; -} - static int qic02_tape_open_no_use_count(struct inode *inode, struct file *filp) { @@ -2385,6 +2375,14 @@ static int qic02_tape_open_no_use_count( } /* qic02_tape_open */ +static int qic02_tape_open(struct inode *inode, struct file *filp) +{ + int open_error; + + open_error = qic02_tape_open_no_use_count(inode, filp); + return open_error; +} + static int qic02_tape_release(struct inode *inode, struct file *filp) { kdev_t dev = inode->i_rdev; -- 1.4.2