From 86bc206f78e3538d33cc9efc94158464c3389966 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 13 Aug 2006 15:30:07 +0200 Subject: [GCC4] fix build error in drivers/scsi/advansys.c This patch fixes these errors with gcc 4 : advansys.c: In function 'asc_isr_callback': advansys.c:7174: warning: comparisons like X<=Y<=Z do not have their mathematical meaning advansys.c: At top level: advansys.c:14581: error: static declaration of 'Default_3550_EEPROM_Config' follows non-static declaration advansys.c:3459: error: previous declaration of 'Default_3550_EEPROM_Config' was here advansys.c:14657: error: static declaration of 'Default_38C0800_EEPROM_Config' follows non-static declaration advansys.c:3460: error: previous declaration of 'Default_38C0800_EEPROM_Config' was here advansys.c:14787: error: static declaration of 'Default_38C1600_EEPROM_Config' follows non-static declaration advansys.c:3461: error: previous declaration of 'Default_38C1600_EEPROM_Config' was here --- drivers/scsi/advansys.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c index d84b30b..9f96173 100644 --- a/drivers/scsi/advansys.c +++ b/drivers/scsi/advansys.c @@ -3456,9 +3456,9 @@ #define QHSTA_M_SGBACKUP_ERROR 0x47 /* * Default EEPROM Configuration structure defined in a_init.c. */ -extern ADVEEP_3550_CONFIG Default_3550_EEPROM_Config; -extern ADVEEP_38C0800_CONFIG Default_38C0800_EEPROM_Config; -extern ADVEEP_38C1600_CONFIG Default_38C1600_EEPROM_Config; +static ADVEEP_3550_CONFIG Default_3550_EEPROM_Config; +static ADVEEP_38C0800_CONFIG Default_38C0800_EEPROM_Config; +static ADVEEP_38C1600_CONFIG Default_38C1600_EEPROM_Config; /* * DvcGetPhyAddr() flag arguments @@ -7171,7 +7171,7 @@ #if ASC_LINUX_KERNEL24 * then return the number of underrun bytes. */ if (scp->request_bufflen != 0 && qdonep->remain_bytes != 0 && - qdonep->remain_bytes <= scp->request_bufflen != 0) { + qdonep->remain_bytes <= scp->request_bufflen) { ASC_DBG1(1, "asc_isr_callback: underrun condition %u bytes\n", (unsigned) qdonep->remain_bytes); scp->resid = qdonep->remain_bytes; -- 1.4.2