Re: [PATCH] build error drivers/staging/dt3155/dt3155_drv.c

Previous thread: linux-next: manual merge of the rr tree with the net tree by Stephen Rothwell on Tuesday, April 6, 2010 - 8:51 pm. (1 message)

Next thread: linux-next: manual merge of the pcmcia tree with the net tree by Stephen Rothwell on Tuesday, April 6, 2010 - 9:17 pm. (1 message)
From: Jan III Sobieski
Date: Tuesday, April 6, 2010 - 9:04 pm

Hi,

  CC      drivers/staging/dt3155/dt3155_drv.o
drivers/staging/dt3155/dt3155_drv.c: In function 'init_module':
drivers/staging/dt3155/dt3155_drv.c:1047: error: implicit declaration
of function 'request_irq'
drivers/staging/dt3155/dt3155_drv.c:1048: error: 'IRQF_SHARED'
undeclared (first use in this function)
drivers/staging/dt3155/dt3155_drv.c:1048: error: (Each undeclared
identifier is reported only once
drivers/staging/dt3155/dt3155_drv.c:1048: error: for each function it
appears in.)
drivers/staging/dt3155/dt3155_drv.c:1048: error: 'IRQF_DISABLED'
undeclared (first use in this function)
drivers/staging/dt3155/dt3155_drv.c: In function 'cleanup_module':
drivers/staging/dt3155/dt3155_drv.c:1091: error: implicit declaration
of function 'free_irq'
make[3]: *** [drivers/staging/dt3155/dt3155_drv.o] Błąd 1
make[2]: *** [drivers/staging/dt3155] Błąd 2
make[1]: *** [drivers/staging] Błąd 2
make: *** [drivers] Błąd 2


-- 
Jan III Sobieski

Signed-off-by: Jan III Sobieski <jan3sobi3ski@gmail.com>

--- linux-2.6-git/drivers/staging/dt3155/dt3155_drv.c   2010-03-27
22:34:58.000000000 +0100
+++ linux-2.6/drivers/staging/dt3155/dt3155_drv.c       2010-04-07
05:54:07.000000000 +0200
@@ -74,6 +74,7 @@ MODULE_LICENSE("GPL");
 #include <linux/types.h>
 #include <linux/poll.h>
 #include <linux/sched.h>
+#include <linux/interrupt.h>

 #include <asm/io.h>
 #include <asm/uaccess.h>
--

From: Jan III Sobieski
Date: Tuesday, April 6, 2010 - 9:05 pm

W dniu 7 kwietnia 2010 06:04 użytkownik Jan III Sobieski




-- 
Jan III Sobieski
--

From: Jan III Sobieski
Date: Tuesday, April 13, 2010 - 3:20 pm

W dniu 7 kwietnia 2010 06:05 użytkownik Jan III Sobieski

I still get this bug on 2.6.34-rc4. Anyone care to pick this patch?

-- 
Jan III Sobieski
--

From: Randy Dunlap
Date: Tuesday, April 13, 2010 - 3:25 pm

I sent a patch on March 09, 2010, that should fix it.
Please test it.  Thanks.

---
From: Randy Dunlap <randy.dunlap@oracle.com>

When the dt3155 driver is built-in (not as a loadable module),
these build errors happen:

drivers/staging/dt3155/dt3155_drv.c:1047: error: implicit declaration of function 'request_irq'
drivers/staging/dt3155/dt3155_drv.c:1048: error: 'IRQF_SHARED' undeclared (first use in this function)
drivers/staging/dt3155/dt3155_drv.c:1048: error: 'IRQF_DISABLED' undeclared (first use in this function)
drivers/staging/dt3155/dt3155_drv.c:1091: error: implicit declaration of function 'free_irq'

so remove the #ifdef MODULE check since it's not needed.
Also remove the CONFIG_PCI check since the Kconfig file already
requires that.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Scott Smedley <ss@aao.gov.au>
---
 drivers/staging/dt3155/dt3155_drv.c |   14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

--- linux-next-20100309.orig/drivers/staging/dt3155/dt3155_drv.c
+++ linux-next-20100309/drivers/staging/dt3155/dt3155_drv.c
@@ -57,19 +57,8 @@ MA 02111-1307 USA
 
 extern void printques(int);
 
-#ifdef MODULE
 #include <linux/module.h>
 #include <linux/interrupt.h>
-
-
-MODULE_LICENSE("GPL");
-
-#endif
-
-#ifndef CONFIG_PCI
-#error  "DT3155 :  Kernel PCI support not enabled (DT3155 drive requires PCI)"
-#endif
-
 #include <linux/pci.h>
 #include <linux/types.h>
 #include <linux/poll.h>
@@ -84,6 +73,9 @@ MODULE_LICENSE("GPL");
 #include "dt3155_io.h"
 #include "allocator.h"
 
+
+MODULE_LICENSE("GPL");
+
 /* Error variable.  Zero means no error. */
 int dt3155_errno = 0;
 
--

Previous thread: linux-next: manual merge of the rr tree with the net tree by Stephen Rothwell on Tuesday, April 6, 2010 - 8:51 pm. (1 message)

Next thread: linux-next: manual merge of the pcmcia tree with the net tree by Stephen Rothwell on Tuesday, April 6, 2010 - 9:17 pm. (1 message)