diff options
author | Olaf Hering <olh@suse.de> | 2005-07-27 11:45:17 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-27 16:26:08 -0700 |
commit | 44456d37b59d8e541936ed26d8b6e08d27e88ac1 (patch) | |
tree | 11ca6fa29b8cfb56ecef2d1f4f9dc2d9d71d2a2f /drivers/scsi/sym53c8xx_2 | |
parent | 02b775696fee75a04041d8d94db26a9462216d24 (diff) | |
download | op-kernel-dev-44456d37b59d8e541936ed26d8b6e08d27e88ac1.zip op-kernel-dev-44456d37b59d8e541936ed26d8b6e08d27e88ac1.tar.gz |
[PATCH] turn many #if $undefined_string into #ifdef $undefined_string
turn many #if $undefined_string into #ifdef $undefined_string to fix some
warnings after -Wno-def was added to global CFLAGS
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/scsi/sym53c8xx_2')
-rw-r--r-- | drivers/scsi/sym53c8xx_2/sym_hipd.h | 16 | ||||
-rw-r--r-- | drivers/scsi/sym53c8xx_2/sym_nvram.c | 2 |
2 files changed, 11 insertions, 7 deletions
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.h b/drivers/scsi/sym53c8xx_2/sym_hipd.h index c55c7a5..3131a6b 100644 --- a/drivers/scsi/sym53c8xx_2/sym_hipd.h +++ b/drivers/scsi/sym53c8xx_2/sym_hipd.h @@ -151,6 +151,16 @@ */ #define SYM_CONF_MIN_ASYNC (40) + +/* + * MEMORY ALLOCATOR. + */ + +#define SYM_MEM_WARN 1 /* Warn on failed operations */ + +#define SYM_MEM_PAGE_ORDER 0 /* 1 PAGE maximum */ +#define SYM_MEM_CLUSTER_SHIFT (PAGE_SHIFT+SYM_MEM_PAGE_ORDER) +#define SYM_MEM_FREE_UNUSED /* Free unused pages immediately */ /* * Shortest memory chunk is (1<<SYM_MEM_SHIFT), currently 16. * Actual allocations happen as SYM_MEM_CLUSTER_SIZE sized. @@ -1192,12 +1202,6 @@ static inline void sym_setup_data_pointers(struct sym_hcb *np, * MEMORY ALLOCATOR. */ -#define SYM_MEM_PAGE_ORDER 0 /* 1 PAGE maximum */ -#define SYM_MEM_CLUSTER_SHIFT (PAGE_SHIFT+SYM_MEM_PAGE_ORDER) -#define SYM_MEM_FREE_UNUSED /* Free unused pages immediately */ - -#define SYM_MEM_WARN 1 /* Warn on failed operations */ - #define sym_get_mem_cluster() \ (void *) __get_free_pages(GFP_ATOMIC, SYM_MEM_PAGE_ORDER) #define sym_free_mem_cluster(p) \ diff --git a/drivers/scsi/sym53c8xx_2/sym_nvram.c b/drivers/scsi/sym53c8xx_2/sym_nvram.c index cd9140e15..994b756 100644 --- a/drivers/scsi/sym53c8xx_2/sym_nvram.c +++ b/drivers/scsi/sym53c8xx_2/sym_nvram.c @@ -367,7 +367,7 @@ static void S24C16_read_byte(struct sym_device *np, u_char *read_data, u_char ac S24C16_write_ack(np, ack_data, gpreg, gpcntl); } -#if SYM_CONF_NVRAM_WRITE_SUPPORT +#ifdef SYM_CONF_NVRAM_WRITE_SUPPORT /* * Write 'len' bytes starting at 'offset'. */ |