From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S263914AbTE0QFc (ORCPT ); Tue, 27 May 2003 12:05:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S263931AbTE0QFc (ORCPT ); Tue, 27 May 2003 12:05:32 -0400 Received: from garnet.acns.fsu.edu ([146.201.2.25]:4318 "EHLO garnet.acns.fsu.edu") by vger.kernel.org with ESMTP id S263914AbTE0QFa (ORCPT ); Tue, 27 May 2003 12:05:30 -0400 Message-ID: <3ED38FC7.7010101@cox.net> Date: Tue, 27 May 2003 12:18:15 -0400 From: David van Hoose User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.2.1) Gecko/20030225 X-Accept-Language: en-us, en MIME-Version: 1.0 To: LKML Subject: [PATCH] Fix ppa.c imm.c compilation failure Content-Type: multipart/mixed; boundary="------------010606020503040308080206" Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org This is a multi-part message in MIME format. --------------010606020503040308080206 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit 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 --------------010606020503040308080206 Content-Type: text/plain; name="patch-dvh.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="patch-dvh.diff" 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) --------------010606020503040308080206--