From 5d2f529c9b83d5f769258928b5ddd82f4dc9979e Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 21 Mar 2016 20:42:51 +0000 Subject: mediatek: bump to v4.4 Signed-off-by: John Crispin SVN-Revision: 49064 --- ...-make-strings-in-parent-name-arrays-const.patch | 91 ---------------------- 1 file changed, 91 deletions(-) delete mode 100644 target/linux/mediatek/patches/0001-clk-make-strings-in-parent-name-arrays-const.patch (limited to 'target/linux/mediatek/patches/0001-clk-make-strings-in-parent-name-arrays-const.patch') diff --git a/target/linux/mediatek/patches/0001-clk-make-strings-in-parent-name-arrays-const.patch b/target/linux/mediatek/patches/0001-clk-make-strings-in-parent-name-arrays-const.patch deleted file mode 100644 index 33f51b9f4f..0000000000 --- a/target/linux/mediatek/patches/0001-clk-make-strings-in-parent-name-arrays-const.patch +++ /dev/null @@ -1,91 +0,0 @@ -From a38e86708141d75c643ffd58865c50a925134e4f Mon Sep 17 00:00:00 2001 -From: Sascha Hauer -Date: Thu, 23 Apr 2015 10:35:38 +0200 -Subject: [PATCH 01/76] clk: make strings in parent name arrays const -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The clk functions and structs declare the parent_name arrays as -'const char **parent_names' which means the parent name strings -are const, but the array itself is not. Use -'const char * const * parent_names' instead which also makes -the array const. This allows us to put the parent_name arrays into -the __initconst section. - -Signed-off-by: Sascha Hauer -Reviewed-by: Krzysztof Kozlowski -Tested-by: Krzysztof Kozlowski -Acked-by: Uwe Kleine-König ---- - drivers/clk/clk-composite.c | 2 +- - drivers/clk/clk-mux.c | 4 ++-- - include/linux/clk-provider.h | 8 ++++---- - 3 files changed, 7 insertions(+), 7 deletions(-) - ---- a/drivers/clk/clk-composite.c -+++ b/drivers/clk/clk-composite.c -@@ -188,7 +188,7 @@ static void clk_composite_disable(struct - } - - struct clk *clk_register_composite(struct device *dev, const char *name, -- const char **parent_names, int num_parents, -+ const char * const *parent_names, int num_parents, - struct clk_hw *mux_hw, const struct clk_ops *mux_ops, - struct clk_hw *rate_hw, const struct clk_ops *rate_ops, - struct clk_hw *gate_hw, const struct clk_ops *gate_ops, ---- a/drivers/clk/clk-mux.c -+++ b/drivers/clk/clk-mux.c -@@ -114,7 +114,7 @@ const struct clk_ops clk_mux_ro_ops = { - EXPORT_SYMBOL_GPL(clk_mux_ro_ops); - - struct clk *clk_register_mux_table(struct device *dev, const char *name, -- const char **parent_names, u8 num_parents, unsigned long flags, -+ const char * const *parent_names, u8 num_parents, unsigned long flags, - void __iomem *reg, u8 shift, u32 mask, - u8 clk_mux_flags, u32 *table, spinlock_t *lock) - { -@@ -166,7 +166,7 @@ struct clk *clk_register_mux_table(struc - EXPORT_SYMBOL_GPL(clk_register_mux_table); - - struct clk *clk_register_mux(struct device *dev, const char *name, -- const char **parent_names, u8 num_parents, unsigned long flags, -+ const char * const *parent_names, u8 num_parents, unsigned long flags, - void __iomem *reg, u8 shift, u8 width, - u8 clk_mux_flags, spinlock_t *lock) - { ---- a/include/linux/clk-provider.h -+++ b/include/linux/clk-provider.h -@@ -209,7 +209,7 @@ struct clk_ops { - struct clk_init_data { - const char *name; - const struct clk_ops *ops; -- const char **parent_names; -+ const char * const *parent_names; - u8 num_parents; - unsigned long flags; - }; -@@ -426,12 +426,12 @@ extern const struct clk_ops clk_mux_ops; - extern const struct clk_ops clk_mux_ro_ops; - - struct clk *clk_register_mux(struct device *dev, const char *name, -- const char **parent_names, u8 num_parents, unsigned long flags, -+ const char * const *parent_names, u8 num_parents, unsigned long flags, - void __iomem *reg, u8 shift, u8 width, - u8 clk_mux_flags, spinlock_t *lock); - - struct clk *clk_register_mux_table(struct device *dev, const char *name, -- const char **parent_names, u8 num_parents, unsigned long flags, -+ const char * const *parent_names, u8 num_parents, unsigned long flags, - void __iomem *reg, u8 shift, u32 mask, - u8 clk_mux_flags, u32 *table, spinlock_t *lock); - -@@ -518,7 +518,7 @@ struct clk_composite { - }; - - struct clk *clk_register_composite(struct device *dev, const char *name, -- const char **parent_names, int num_parents, -+ const char * const *parent_names, int num_parents, - struct clk_hw *mux_hw, const struct clk_ops *mux_ops, - struct clk_hw *rate_hw, const struct clk_ops *rate_ops, - struct clk_hw *gate_hw, const struct clk_ops *gate_ops, -- cgit v1.2.3