From b6034f306b581a70b2edf679095f7f989cfdb45d Mon Sep 17 00:00:00 2001 From: James Bottomley Date: Mon, 5 Jan 2004 10:12:21 -0600 Subject: [PATCH] 64 bit updates for Workbit NinjaSCSI driver From: GOTO Masanori Thanks for your report. I compiled and exactly I saw some warnings on amd64 machine. I checked all warnings, and these warnings are trivial, they can be easily fixed. I attached the patch to fix warnings. Nsp32 is PCI device driver, so it should also work on amd64 architecture. --- drivers/scsi/nsp32.h | 5 ----- drivers/scsi/nsp32_io.h | 10 +++++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/scsi/nsp32.h b/drivers/scsi/nsp32.h index aead2f757f0df..47c00a6260eec 100644 --- a/drivers/scsi/nsp32.h +++ b/drivers/scsi/nsp32.h @@ -667,10 +667,5 @@ static inline struct Scsi_Host *scsi_host_hn_get(unsigned short hostno) } #endif -/* for Kernel 2.6 */ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) -# define __devinitdata /* */ -#endif - #endif /* _NSP32_H */ /* end */ diff --git a/drivers/scsi/nsp32_io.h b/drivers/scsi/nsp32_io.h index 0a97c4fa6a059..e3f3c27b01efb 100644 --- a/drivers/scsi/nsp32_io.h +++ b/drivers/scsi/nsp32_io.h @@ -173,7 +173,7 @@ static inline void nsp32_index_write4(unsigned int base, /*==============================================*/ -static inline unsigned char nsp32_mmio_index_read1(unsigned int base, +static inline unsigned char nsp32_mmio_index_read1(unsigned long base, unsigned int reg) { volatile unsigned short *index_ptr, *data_ptr; @@ -185,7 +185,7 @@ static inline unsigned char nsp32_mmio_index_read1(unsigned int base, return readb(data_ptr); } -static inline void nsp32_mmio_index_write1(unsigned int base, +static inline void nsp32_mmio_index_write1(unsigned long base, unsigned int reg, unsigned char val) { @@ -198,8 +198,8 @@ static inline void nsp32_mmio_index_write1(unsigned int base, writeb(val, data_ptr ); } -static inline unsigned short nsp32_mmio_index_read2(unsigned int base, - unsigned int reg) +static inline unsigned short nsp32_mmio_index_read2(unsigned long base, + unsigned int reg) { volatile unsigned short *index_ptr, *data_ptr; @@ -210,7 +210,7 @@ static inline unsigned short nsp32_mmio_index_read2(unsigned int base, return le16_to_cpu(readw(data_ptr)); } -static inline void nsp32_mmio_index_write2(unsigned int base, +static inline void nsp32_mmio_index_write2(unsigned long base, unsigned int reg, unsigned short val) { -- 2.53.0