From b1d18dc06ba6b9056f95aaf1f8c464830846f87f Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Mon, 21 Apr 2008 22:26:40 +0000 Subject: arm: Storage class should be before const qualifier The C99 specification states in section 6.11.5: The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature. Signed-off-by: Tobias Klauser Signed-off-by: Jesper Juhl --- include/asm-arm/hardware/iop3xx-adma.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/asm-arm/hardware/iop3xx-adma.h b/include/asm-arm/hardware/iop3xx-adma.h index 84d635b0a71..a32b86ac62a 100644 --- a/include/asm-arm/hardware/iop3xx-adma.h +++ b/include/asm-arm/hardware/iop3xx-adma.h @@ -260,7 +260,7 @@ static inline int iop_chan_memset_slot_count(size_t len, int *slots_per_op) static inline int iop3xx_aau_xor_slot_count(size_t len, int src_cnt, int *slots_per_op) { - const static int slot_count_table[] = { 0, + static const int slot_count_table[] = { 0, 1, 1, 1, 1, /* 01 - 04 */ 2, 2, 2, 2, /* 05 - 08 */ 4, 4, 4, 4, /* 09 - 12 */ @@ -369,7 +369,7 @@ static inline u32 iop_desc_get_byte_count(struct iop_adma_desc_slot *desc, /* translate the src_idx to a descriptor word index */ static inline int __desc_idx(int src_idx) { - const static int desc_idx_table[] = { 0, 0, 0, 0, + static const int desc_idx_table[] = { 0, 0, 0, 0, 0, 1, 2, 3, 5, 6, 7, 8, 9, 10, 11, 12, -- cgit v1.2.3 From 218ff137bc67252694420563d23d051ab9227f17 Mon Sep 17 00:00:00 2001 From: Johannes Weiner Date: Mon, 21 Apr 2008 22:35:29 +0000 Subject: Remove unused MAX_NODES_SHIFT MAX_NODES_SHIFT is not referenced anywhere in the tree, so dump it. Signed-off-by: Johannes Weiner Signed-off-by: Jesper Juhl --- include/linux/mmzone.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include') diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 8d8d1977736..9f274a687c7 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -699,7 +699,6 @@ extern char numa_zonelist_order[]; extern struct pglist_data contig_page_data; #define NODE_DATA(nid) (&contig_page_data) #define NODE_MEM_MAP(nid) mem_map -#define MAX_NODES_SHIFT 1 #else /* CONFIG_NEED_MULTIPLE_NODES */ -- cgit v1.2.3 From 8a5703f846e2363fc466aff3f53608340a1ae33f Mon Sep 17 00:00:00 2001 From: Sebastian Siewior Date: Mon, 21 Apr 2008 22:38:45 +0000 Subject: DMA engine: typo fixes Spelling fixes for dmaengine.[ch] Signed-off-by: Sebastian Siewior Acked-by: Maciej Sosnowski Signed-off-by: Jesper Juhl --- include/linux/dmaengine.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index b4d84ed6187..d08a5c5eb92 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -404,7 +404,7 @@ static inline enum dma_status dma_async_is_tx_complete(struct dma_chan *chan, * @last_used: last cookie value handed out * * dma_async_is_complete() is used in dma_async_memcpy_complete() - * the test logic is seperated for lightweight testing of multiple cookies + * the test logic is separated for lightweight testing of multiple cookies */ static inline enum dma_status dma_async_is_complete(dma_cookie_t cookie, dma_cookie_t last_complete, dma_cookie_t last_used) -- cgit v1.2.3 From dd89db1df98003fadafa711ab8bc497aaf92980a Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Mon, 21 Apr 2008 22:43:55 +0000 Subject: KEYS: Fix the comment to match the file name in rxrpc-type.h. Signed-off-by: Robert P. J. Day Acked-by: David Howells Signed-off-by: Jesper Juhl --- include/keys/rxrpc-type.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/keys/rxrpc-type.h b/include/keys/rxrpc-type.h index 4ea429b1875..7609365577f 100644 --- a/include/keys/rxrpc-type.h +++ b/include/keys/rxrpc-type.h @@ -21,4 +21,4 @@ extern struct key_type key_type_rxrpc; extern struct key *rxrpc_get_null_key(const char *); -#endif /* _KEYS_USER_TYPE_H */ +#endif /* _KEYS_RXRPC_TYPE_H */ -- cgit v1.2.3 From 37679011c5a674eb80bff5c2b9b067bf16011d46 Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Mon, 21 Apr 2008 22:56:14 +0000 Subject: Generate a slightly more informative error msg for bad HZ Generate a slightly more informative error msg for bad HZ in include/linux/jiffies.h Signed-off-by: Robert P. J. Day Signed-off-by: Jesper Juhl --- include/linux/jiffies.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h index e0b5b684d83..8f4aa7280ca 100644 --- a/include/linux/jiffies.h +++ b/include/linux/jiffies.h @@ -36,7 +36,7 @@ #elif HZ >= 6144 && HZ < 12288 # define SHIFT_HZ 13 #else -# error You lose. +# error Invalid value of HZ. #endif /* LATCH is used in the interval timer and ftape setup. */ -- cgit v1.2.3