lkml.org 
[lkml]   [2003]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] Fix ppa.c imm.c compilation failure
Attached is a patch that nicely fixes compilation failures in ppa.c and 
imm.c with 2.5.70-bk1.
Applies against 2.5.70-bk1.

* Removes the 'int hostno' parameter from imm_proc_info().
Parameter isn't used and breaks the pointer matching.
* 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.

-David
diff -Nru a/drivers/scsi/imm.c b/drivers/scsi/imm.c
--- a/drivers/scsi/imm.c 2003-05-27 12:09:47.000000000 -0400
+++ b/drivers/scsi/imm.c 2003-05-27 12:05:29.000000000 -0400
@@ -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;
diff -Nru a/drivers/scsi/imm.h b/drivers/scsi/imm.h
--- a/drivers/scsi/imm.h 2003-05-27 12:09:47.000000000 -0400
+++ b/drivers/scsi/imm.h 2003-05-27 12:05:11.000000000 -0400
@@ -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 *);

diff -Nru a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c
--- a/drivers/scsi/ppa.c 2003-05-27 12:09:47.000000000 -0400
+++ b/drivers/scsi/ppa.c 2003-05-27 11:56:01.000000000 -0400
@@ -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)
\
 
 \ /
  Last update: 2005-03-22 13:35    [W:0.022 / U:1.444 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site