summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-05-28 10:18:55 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-07-01 14:15:41 +0100
commit550ec36f507177470a394c4dfffcaf986ca25818 (patch)
tree5095d541790a5cd9b199d626aceea3143f56c170
parentb23f204c8dbbed8e501442c47d7639aac21a3d84 (diff)
downloadlinux-3.10-550ec36f507177470a394c4dfffcaf986ca25818.tar.gz
linux-3.10-550ec36f507177470a394c4dfffcaf986ca25818.tar.bz2
linux-3.10-550ec36f507177470a394c4dfffcaf986ca25818.zip
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.c2
-rw-r--r--include/linux/amba/pl08x.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index 94949909e4e..775efef0349 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -237,7 +237,7 @@ struct pl08x_dma_chan {
struct pl08x_phy_chan *phychan;
int phychan_hold;
struct tasklet_struct tasklet;
- char *name;
+ const char *name;
const struct pl08x_channel_data *cd;
dma_addr_t src_addr;
dma_addr_t dst_addr;
diff --git a/include/linux/amba/pl08x.h b/include/linux/amba/pl08x.h
index 48d02bf66ec..158ce2634b0 100644
--- a/include/linux/amba/pl08x.h
+++ b/include/linux/amba/pl08x.h
@@ -58,7 +58,7 @@ enum {
* these buses (use PL08X_AHB1 | PL08X_AHB2).
*/
struct pl08x_channel_data {
- char *bus_id;
+ const char *bus_id;
int min_signal;
int max_signal;
u32 muxval;