Skip to contentSkip to conversation

2.4.17 drivers/scsi/NCR5380.c

PATCH In review Keith Owens 2 participants 2 messages Dec 28, 2001 SCSI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 2.4.17 drivers/scsi/NCR5380.c

Several drivers #include "NCR5380.c". If two or more of those drivers are built into vmlinux then you get duplicate global symbols. Functions in NCR5380.c must be static. There are a couple of other suspect functions but they are conditioned by #ifdef so I left them alone.

Index: 17.9/drivers/scsi/NCR5380.c

drivers/scsi/NCR5380.c Fri, 28 Dec 2001 15:15:16 +1100 kaos (linux-2.4/U/b/0_NCR5380.c 1.4 644) renamed from drivers/scsi/NCR5380.c Sat, 08 Dec 2001 10:12:02 +1100 kaos (linux-2.4/U/b/0_NCR5380.c 1.4 644) +1 -1
@@ -612,7 +612,7 @@ static int NCR5380_set_timer(struct Scsi
  *	Locks: disables irqs, takes and frees io_request_lock
  */
  
-void NCR5380_timer_fn(unsigned long unused)
+static void NCR5380_timer_fn(unsigned long unused)
 {
 	struct Scsi_Host *instance;
 
#1 lore raw
Quoted 3 lines

Functions in NCR5380.c must be static. There are a couple of other suspect functions but they are conditioned by #ifdef so I left them alone.

Im not totally confident the ifdef ones are correct either. The timer one is definitely correct. Marcelo I guess I'm the nearest thing to NCR5380 maintainer - please apply this one

Quoted 10 lines

Index: 17.9/drivers/scsi/NCR5380.c

drivers/scsi/NCR5380.c Fri, 28 Dec 2001 15:15:16 +1100 kaos (linux-2.4/U/b/0_NCR5380.c 1.4 644) renamed from drivers/scsi/NCR5380.c Sat, 08 Dec 2001 10:12:02 +1100 kaos (linux-2.4/U/b/0_NCR5380.c 1.4 644) +1 -1
@@ -612,7 +612,7 @@ static int NCR5380_set_timer(struct Scsi
  *	Locks: disables irqs, takes and frees io_request_lock
  */
 
-void NCR5380_timer_fn(unsigned long unused)
+static void NCR5380_timer_fn(unsigned long unused)
 {