diff options
author | Olaf Hering <olh@suse.de> | 2005-07-27 14:45:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-27 19:26:08 -0400 |
commit | 44456d37b59d8e541936ed26d8b6e08d27e88ac1 (patch) | |
tree | 11ca6fa29b8cfb56ecef2d1f4f9dc2d9d71d2a2f /drivers/scsi/sym53c8xx_2 | |
parent | 02b775696fee75a04041d8d94db26a9462216d24 (diff) |
[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 c55c7a57afa0..3131a6bf7ab7 100644 --- a/drivers/scsi/sym53c8xx_2/sym_hipd.h +++ b/drivers/scsi/sym53c8xx_2/sym_hipd.h | |||
@@ -151,6 +151,16 @@ | |||
151 | */ | 151 | */ |
152 | #define SYM_CONF_MIN_ASYNC (40) | 152 | #define SYM_CONF_MIN_ASYNC (40) |
153 | 153 | ||
154 | |||
155 | /* | ||
156 | * MEMORY ALLOCATOR. | ||
157 | */ | ||
158 | |||
159 | #define SYM_MEM_WARN 1 /* Warn on failed operations */ | ||
160 | |||
161 | #define SYM_MEM_PAGE_ORDER 0 /* 1 PAGE maximum */ | ||
162 | #define SYM_MEM_CLUSTER_SHIFT (PAGE_SHIFT+SYM_MEM_PAGE_ORDER) | ||
163 | #define SYM_MEM_FREE_UNUSED /* Free unused pages immediately */ | ||
154 | /* | 164 | /* |
155 | * Shortest memory chunk is (1<<SYM_MEM_SHIFT), currently 16. | 165 | * Shortest memory chunk is (1<<SYM_MEM_SHIFT), currently 16. |
156 | * Actual allocations happen as SYM_MEM_CLUSTER_SIZE sized. | 166 | * Actual allocations happen as SYM_MEM_CLUSTER_SIZE sized. |
@@ -1192,12 +1202,6 @@ static inline void sym_setup_data_pointers(struct sym_hcb *np, | |||
1192 | * MEMORY ALLOCATOR. | 1202 | * MEMORY ALLOCATOR. |
1193 | */ | 1203 | */ |
1194 | 1204 | ||
1195 | #define SYM_MEM_PAGE_ORDER 0 /* 1 PAGE maximum */ | ||
1196 | #define SYM_MEM_CLUSTER_SHIFT (PAGE_SHIFT+SYM_MEM_PAGE_ORDER) | ||
1197 | #define SYM_MEM_FREE_UNUSED /* Free unused pages immediately */ | ||
1198 | |||
1199 | #define SYM_MEM_WARN 1 /* Warn on failed operations */ | ||
1200 | |||
1201 | #define sym_get_mem_cluster() \ | 1205 | #define sym_get_mem_cluster() \ |
1202 | (void *) __get_free_pages(GFP_ATOMIC, SYM_MEM_PAGE_ORDER) | 1206 | (void *) __get_free_pages(GFP_ATOMIC, SYM_MEM_PAGE_ORDER) |
1203 | #define sym_free_mem_cluster(p) \ | 1207 | #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 cd9140e158cf..994b7566bcac 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 | |||
367 | S24C16_write_ack(np, ack_data, gpreg, gpcntl); | 367 | S24C16_write_ack(np, ack_data, gpreg, gpcntl); |
368 | } | 368 | } |
369 | 369 | ||
370 | #if SYM_CONF_NVRAM_WRITE_SUPPORT | 370 | #ifdef SYM_CONF_NVRAM_WRITE_SUPPORT |
371 | /* | 371 | /* |
372 | * Write 'len' bytes starting at 'offset'. | 372 | * Write 'len' bytes starting at 'offset'. |
373 | */ | 373 | */ |