diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-05-28 05:18:55 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-07-01 09:15:41 -0400 |
commit | 550ec36f507177470a394c4dfffcaf986ca25818 (patch) | |
tree | 5095d541790a5cd9b199d626aceea3143f56c170 | |
parent | b23f204c8dbbed8e501442c47d7639aac21a3d84 (diff) |
dmaengine: PL08x: constify channel names and bus_id strings
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Tested-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | drivers/dma/amba-pl08x.c | 2 | ||||
-rw-r--r-- | include/linux/amba/pl08x.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c index 94949909e4e9..775efef0349c 100644 --- a/drivers/dma/amba-pl08x.c +++ b/drivers/dma/amba-pl08x.c | |||
@@ -237,7 +237,7 @@ struct pl08x_dma_chan { | |||
237 | struct pl08x_phy_chan *phychan; | 237 | struct pl08x_phy_chan *phychan; |
238 | int phychan_hold; | 238 | int phychan_hold; |
239 | struct tasklet_struct tasklet; | 239 | struct tasklet_struct tasklet; |
240 | char *name; | 240 | const char *name; |
241 | const struct pl08x_channel_data *cd; | 241 | const struct pl08x_channel_data *cd; |
242 | dma_addr_t src_addr; | 242 | dma_addr_t src_addr; |
243 | dma_addr_t dst_addr; | 243 | dma_addr_t dst_addr; |
diff --git a/include/linux/amba/pl08x.h b/include/linux/amba/pl08x.h index 48d02bf66ec9..158ce2634b01 100644 --- a/include/linux/amba/pl08x.h +++ b/include/linux/amba/pl08x.h | |||
@@ -58,7 +58,7 @@ enum { | |||
58 | * these buses (use PL08X_AHB1 | PL08X_AHB2). | 58 | * these buses (use PL08X_AHB1 | PL08X_AHB2). |
59 | */ | 59 | */ |
60 | struct pl08x_channel_data { | 60 | struct pl08x_channel_data { |
61 | char *bus_id; | 61 | const char *bus_id; |
62 | int min_signal; | 62 | int min_signal; |
63 | int max_signal; | 63 | int max_signal; |
64 | u32 muxval; | 64 | u32 muxval; |