Commit d4a48a38 authored by Linus Torvalds's avatar Linus Torvalds

NCR5380: don't play games with NCR5380_proc_info() - just mark it

static unconditionally, to allow multiple built-in modules.
parent 7d33101c
...@@ -852,9 +852,7 @@ char *lprint_command(unsigned char *cmd, char *pos, char *buffer, int len); ...@@ -852,9 +852,7 @@ char *lprint_command(unsigned char *cmd, char *pos, char *buffer, int len);
static static
char *lprint_opcode(int opcode, char *pos, char *buffer, int length); char *lprint_opcode(int opcode, char *pos, char *buffer, int length);
#ifndef NCR5380_proc_info
static static
#endif
int NCR5380_proc_info(struct Scsi_Host *instance, char *buffer, char **start, off_t offset, int length, int inout) int NCR5380_proc_info(struct Scsi_Host *instance, char *buffer, char **start, off_t offset, int length, int inout)
{ {
char *pos = buffer; char *pos = buffer;
......
...@@ -310,10 +310,8 @@ static int NCR5380_bus_reset(Scsi_Cmnd * cmd); ...@@ -310,10 +310,8 @@ static int NCR5380_bus_reset(Scsi_Cmnd * cmd);
static int NCR5380_host_reset(Scsi_Cmnd * cmd); static int NCR5380_host_reset(Scsi_Cmnd * cmd);
static int NCR5380_device_reset(Scsi_Cmnd * cmd); static int NCR5380_device_reset(Scsi_Cmnd * cmd);
static int NCR5380_queue_command(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *)); static int NCR5380_queue_command(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *));
#ifdef NCR5380_proc_info static int NCR5380_proc_info(struct Scsi_Host *instance, char *buffer, char **start,
int NCR5380_proc_info(struct Scsi_Host *instance, char *buffer, char **start,
off_t offset, int length, int inout); off_t offset, int length, int inout);
#endif
static void NCR5380_reselect(struct Scsi_Host *instance); static void NCR5380_reselect(struct Scsi_Host *instance);
static int NCR5380_select(struct Scsi_Host *instance, Scsi_Cmnd * cmd, int tag); static int NCR5380_select(struct Scsi_Host *instance, Scsi_Cmnd * cmd, int tag);
......
...@@ -743,9 +743,7 @@ static void NCR5380_print_status (struct Scsi_Host *instance) ...@@ -743,9 +743,7 @@ static void NCR5380_print_status (struct Scsi_Host *instance)
static static
char *lprint_Scsi_Cmnd (Scsi_Cmnd *cmd, char *pos, char *buffer, int length); char *lprint_Scsi_Cmnd (Scsi_Cmnd *cmd, char *pos, char *buffer, int length);
#ifndef NCR5380_proc_info
static static
#endif
int NCR5380_proc_info (struct Scsi_Host *instance, char *buffer, char **start, off_t offset, int NCR5380_proc_info (struct Scsi_Host *instance, char *buffer, char **start, off_t offset,
int length, int inout) int length, int inout)
{ {
......
...@@ -780,7 +780,7 @@ static int sprint_Scsi_Cmnd(char *buffer, int len, Scsi_Cmnd * cmd) ...@@ -780,7 +780,7 @@ static int sprint_Scsi_Cmnd(char *buffer, int len, Scsi_Cmnd * cmd)
* Locks: global cli/lock for queue walk * Locks: global cli/lock for queue walk
*/ */
int generic_NCR5380_proc_info(struct Scsi_Host *scsi_ptr, char *buffer, char **start, off_t offset, int length, int inout) static int generic_NCR5380_proc_info(struct Scsi_Host *scsi_ptr, char *buffer, char **start, off_t offset, int length, int inout)
{ {
int len = 0; int len = 0;
NCR5380_local_declare(); NCR5380_local_declare();
......
...@@ -768,9 +768,7 @@ static void NCR5380_print_status (struct Scsi_Host *instance) ...@@ -768,9 +768,7 @@ static void NCR5380_print_status (struct Scsi_Host *instance)
static static
char *lprint_Scsi_Cmnd (Scsi_Cmnd *cmd, char *pos, char *buffer, int length); char *lprint_Scsi_Cmnd (Scsi_Cmnd *cmd, char *pos, char *buffer, int length);
#ifndef NCR5380_proc_info
static static
#endif
int NCR5380_proc_info (struct Scsi_Host *instance, char *buffer, char **start, off_t offset, int NCR5380_proc_info (struct Scsi_Host *instance, char *buffer, char **start, off_t offset,
int length, int inout) int length, int inout)
{ {
......
...@@ -754,7 +754,7 @@ static void NCR5380_print_status (struct Scsi_Host *instance) ...@@ -754,7 +754,7 @@ static void NCR5380_print_status (struct Scsi_Host *instance)
static static
char *lprint_Scsi_Cmnd (Scsi_Cmnd *cmd, char *pos, char *buffer, int length); char *lprint_Scsi_Cmnd (Scsi_Cmnd *cmd, char *pos, char *buffer, int length);
int NCR5380_proc_info (struct Scsi_Host *instance, char *buffer, char **start, static int NCR5380_proc_info (struct Scsi_Host *instance, char *buffer, char **start,
off_t offset, int length, int inout) off_t offset, int length, int inout)
{ {
char *pos = buffer; char *pos = buffer;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment