aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2007-05-23 17:41:56 -0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2007-05-24 10:13:25 -0400
commit702809ce9b1e91400826ec2ff203c06fdad36034 (patch)
treefb8b9113d832ba8a67758c7275f9b2f8ab4d6ba8
parent476834c25a04025d895f64d42affcd31bfb318cc (diff)
[SCSI] ncr5380 warning fixes
squish these: drivers/scsi/NCR5380.c:360: warning: 'phases' defined but not used drivers/scsi/NCR5380.c:360: warning: 'phases' defined but not used drivers/scsi/NCR5380.c:633: warning: 'NCR5380_print_options' defined but not used drivers/scsi/NCR5380.c:708: warning: 'NCR5380_proc_info' defined but not used drivers/scsi/NCR5380.c:360: warning: 'phases' defined but not used drivers/scsi/NCR5380.c:579: warning: 'NCR5380_probe_irq' defined but not used drivers/scsi/NCR5380.c:360: warning: 'phases' defined but not used drivers/scsi/NCR5380.c:708: warning: 'notyet_generic_proc_info' defined but not used drivers/scsi/NCR5380.c:708: warning: 'notyet_generic_proc_info' defined but not used Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r--drivers/scsi/NCR5380.c12
-rw-r--r--drivers/scsi/NCR5380.h6
2 files changed, 10 insertions, 8 deletions
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index 18359f6372f7..37de6b37b084 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -357,7 +357,7 @@ static int NCR5380_poll_politely(struct Scsi_Host *instance, int reg, int bit, i
357static struct { 357static struct {
358 unsigned char value; 358 unsigned char value;
359 const char *name; 359 const char *name;
360} phases[] = { 360} phases[] __maybe_unused = {
361 {PHASE_DATAOUT, "DATAOUT"}, 361 {PHASE_DATAOUT, "DATAOUT"},
362 {PHASE_DATAIN, "DATAIN"}, 362 {PHASE_DATAIN, "DATAIN"},
363 {PHASE_CMDOUT, "CMDOUT"}, 363 {PHASE_CMDOUT, "CMDOUT"},
@@ -575,7 +575,8 @@ static irqreturn_t __init probe_intr(int irq, void *dev_id)
575 * Locks: none, irqs must be enabled on entry 575 * Locks: none, irqs must be enabled on entry
576 */ 576 */
577 577
578static int __init NCR5380_probe_irq(struct Scsi_Host *instance, int possible) 578static int __init __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance,
579 int possible)
579{ 580{
580 NCR5380_local_declare(); 581 NCR5380_local_declare();
581 struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata; 582 struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata;
@@ -629,7 +630,8 @@ static int __init NCR5380_probe_irq(struct Scsi_Host *instance, int possible)
629 * Locks: none 630 * Locks: none
630 */ 631 */
631 632
632static void __init NCR5380_print_options(struct Scsi_Host *instance) 633static void __init __maybe_unused
634NCR5380_print_options(struct Scsi_Host *instance)
633{ 635{
634 printk(" generic options" 636 printk(" generic options"
635#ifdef AUTOPROBE_IRQ 637#ifdef AUTOPROBE_IRQ
@@ -703,8 +705,8 @@ char *lprint_command(unsigned char *cmd, char *pos, char *buffer, int len);
703static 705static
704char *lprint_opcode(int opcode, char *pos, char *buffer, int length); 706char *lprint_opcode(int opcode, char *pos, char *buffer, int length);
705 707
706static 708static int __maybe_unused NCR5380_proc_info(struct Scsi_Host *instance,
707int NCR5380_proc_info(struct Scsi_Host *instance, char *buffer, char **start, off_t offset, int length, int inout) 709 char *buffer, char **start, off_t offset, int length, int inout)
708{ 710{
709 char *pos = buffer; 711 char *pos = buffer;
710 struct NCR5380_hostdata *hostdata; 712 struct NCR5380_hostdata *hostdata;
diff --git a/drivers/scsi/NCR5380.h b/drivers/scsi/NCR5380.h
index 713a108c02ef..bccf13f71532 100644
--- a/drivers/scsi/NCR5380.h
+++ b/drivers/scsi/NCR5380.h
@@ -299,7 +299,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance);
299static irqreturn_t NCR5380_intr(int irq, void *dev_id); 299static irqreturn_t NCR5380_intr(int irq, void *dev_id);
300#endif 300#endif
301static void NCR5380_main(struct work_struct *work); 301static void NCR5380_main(struct work_struct *work);
302static void NCR5380_print_options(struct Scsi_Host *instance); 302static void __maybe_unused NCR5380_print_options(struct Scsi_Host *instance);
303#ifdef NDEBUG 303#ifdef NDEBUG
304static void NCR5380_print_phase(struct Scsi_Host *instance); 304static void NCR5380_print_phase(struct Scsi_Host *instance);
305static void NCR5380_print(struct Scsi_Host *instance); 305static void NCR5380_print(struct Scsi_Host *instance);
@@ -307,8 +307,8 @@ static void NCR5380_print(struct Scsi_Host *instance);
307static int NCR5380_abort(Scsi_Cmnd * cmd); 307static int NCR5380_abort(Scsi_Cmnd * cmd);
308static int NCR5380_bus_reset(Scsi_Cmnd * cmd); 308static int NCR5380_bus_reset(Scsi_Cmnd * cmd);
309static int NCR5380_queue_command(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *)); 309static int NCR5380_queue_command(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *));
310static int NCR5380_proc_info(struct Scsi_Host *instance, char *buffer, char **start, 310static int __maybe_unused NCR5380_proc_info(struct Scsi_Host *instance,
311off_t offset, int length, int inout); 311 char *buffer, char **start, off_t offset, int length, int inout);
312 312
313static void NCR5380_reselect(struct Scsi_Host *instance); 313static void NCR5380_reselect(struct Scsi_Host *instance);
314static int NCR5380_select(struct Scsi_Host *instance, Scsi_Cmnd * cmd, int tag); 314static int NCR5380_select(struct Scsi_Host *instance, Scsi_Cmnd * cmd, int tag);