Fix compilation errors in ppa and imm modules

PATCH New David van Hoose 1 participant 1 message Jun 2, 2003 SCSI

Share & tools

David van Hoose

author

2003-06-02 15:06 UTC #0 lore raw

PATCH 1/1 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.

If anyone has any questions, cc emails to me as I am not on the linux-scsi mailing list.

Thank you,
David

drivers/scsi/imm.c +1 -1

diff -Nru a/drivers/scsi/imm.c b/drivers/scsi/imm.c
@@ -254,7 +254,7 @@
 }
 
 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 len = 0;

drivers/scsi/imm.h +1 -0

diff -Nru a/drivers/scsi/imm.h b/drivers/scsi/imm.h
@@ -159,6 +159,7 @@
 int imm_queuecommand(Scsi_Cmnd *, void (*done) (Scsi_Cmnd *));
 int imm_abort(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 *,
 		sector_t, int *);

drivers/scsi/ppa.c +1 -1

diff -Nru a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c
@@ -277,7 +277,7 @@
     int len = 0;
 
     for (i = 0; i < 4; i++)
-	if (ppa_hosts[i] == host)
+	if (ppa_hosts[i].host == host->host_no)
 	    break;
 
     if (inout)