Commit 2a329e52 authored by David van Hoose's avatar David van Hoose Committed by James Bottomley

[PATCH] Fix compilation errors in ppa and imm modules

This patch is a resend from LKML since it has yet to be applied in 
either bk7. Patrick suggested I send it here. This patch fixes 
compilation failures in ppa.c and imm.c that were introduced in 2.5.70-bk1.

* Removes the 'int hostno' parameter from imm_proc_info().
Parameter isn't used and breaks the pointer matching for Scsi_Host.
* Added the prototype for imm_proc_info() in imm.h
* Modified line 280 of ppa.c to match concept on line 263 of imm.c.
parent 3aab50ad
...@@ -254,7 +254,7 @@ static inline int imm_proc_write(int hostno, char *buffer, int length) ...@@ -254,7 +254,7 @@ static inline int imm_proc_write(int hostno, char *buffer, int length)
} }
int imm_proc_info(struct Scsi_Host *host, char *buffer, char **start, off_t offset, int imm_proc_info(struct Scsi_Host *host, char *buffer, char **start, off_t offset,
int length, int hostno, int inout) int length, int inout)
{ {
int i; int i;
int len = 0; int len = 0;
......
...@@ -159,6 +159,7 @@ int imm_command(Scsi_Cmnd *); ...@@ -159,6 +159,7 @@ int imm_command(Scsi_Cmnd *);
int imm_queuecommand(Scsi_Cmnd *, void (*done) (Scsi_Cmnd *)); int imm_queuecommand(Scsi_Cmnd *, void (*done) (Scsi_Cmnd *));
int imm_abort(Scsi_Cmnd *); int imm_abort(Scsi_Cmnd *);
int imm_reset(Scsi_Cmnd *); int imm_reset(Scsi_Cmnd *);
int imm_proc_info(struct Scsi_Host *, char *, char **, off_t, int, int);
int imm_biosparam(struct scsi_device *, struct block_device *, int imm_biosparam(struct scsi_device *, struct block_device *,
sector_t, int *); sector_t, int *);
......
...@@ -277,7 +277,7 @@ int ppa_proc_info(struct Scsi_Host *host, char *buffer, char **start, off_t offs ...@@ -277,7 +277,7 @@ int ppa_proc_info(struct Scsi_Host *host, char *buffer, char **start, off_t offs
int len = 0; int len = 0;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
if (ppa_hosts[i] == host) if (ppa_hosts[i].host == host->host_no)
break; break;
if (inout) if (inout)
......
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