LinuxLists.cc - [PATCH] clk: hi3620: Move const initdata into correct code section

2014-11-10 12:58:47

Subject: [PATCH] clk: hi3620: Move const initdata into correct code section

Use __initconst instead of __initdata for constant init data.

Signed-off-by: Bintian Wang <[email protected]>
---
drivers/clk/hisilicon/clk-hi3620.c | 70 +++++++++++++++++++-------------------
1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/drivers/clk/hisilicon/clk-hi3620.c b/drivers/clk/hisilicon/clk-hi3620.c
index 339945d..640ea33 100644
--- a/drivers/clk/hisilicon/clk-hi3620.c
+++ b/drivers/clk/hisilicon/clk-hi3620.c
@@ -38,44 +38,44 @@
#include "clk.h"

/* clock parent list */
-static const char *timer0_mux_p[] __initdata = { "osc32k", "timerclk01", };
-static const char *timer1_mux_p[] __initdata = { "osc32k", "timerclk01", };
-static const char *timer2_mux_p[] __initdata = { "osc32k", "timerclk23", };
-static const char *timer3_mux_p[] __initdata = { "osc32k", "timerclk23", };
-static const char *timer4_mux_p[] __initdata = { "osc32k", "timerclk45", };
-static const char *timer5_mux_p[] __initdata = { "osc32k", "timerclk45", };
-static const char *timer6_mux_p[] __initdata = { "osc32k", "timerclk67", };
-static const char *timer7_mux_p[] __initdata = { "osc32k", "timerclk67", };
-static const char *timer8_mux_p[] __initdata = { "osc32k", "timerclk89", };
-static const char *timer9_mux_p[] __initdata = { "osc32k", "timerclk89", };
-static const char *uart0_mux_p[] __initdata = { "osc26m", "pclk", };
-static const char *uart1_mux_p[] __initdata = { "osc26m", "pclk", };
-static const char *uart2_mux_p[] __initdata = { "osc26m", "pclk", };
-static const char *uart3_mux_p[] __initdata = { "osc26m", "pclk", };
-static const char *uart4_mux_p[] __initdata = { "osc26m", "pclk", };
-static const char *spi0_mux_p[] __initdata = { "osc26m", "rclk_cfgaxi", };
-static const char *spi1_mux_p[] __initdata = { "osc26m", "rclk_cfgaxi", };
-static const char *spi2_mux_p[] __initdata = { "osc26m", "rclk_cfgaxi", };
+static const char *timer0_mux_p[] __initconst = { "osc32k", "timerclk01", };
+static const char *timer1_mux_p[] __initconst = { "osc32k", "timerclk01", };
+static const char *timer2_mux_p[] __initconst = { "osc32k", "timerclk23", };
+static const char *timer3_mux_p[] __initconst = { "osc32k", "timerclk23", };
+static const char *timer4_mux_p[] __initconst = { "osc32k", "timerclk45", };
+static const char *timer5_mux_p[] __initconst = { "osc32k", "timerclk45", };
+static const char *timer6_mux_p[] __initconst = { "osc32k", "timerclk67", };
+static const char *timer7_mux_p[] __initconst = { "osc32k", "timerclk67", };
+static const char *timer8_mux_p[] __initconst = { "osc32k", "timerclk89", };
+static const char *timer9_mux_p[] __initconst = { "osc32k", "timerclk89", };
+static const char *uart0_mux_p[] __initconst = { "osc26m", "pclk", };
+static const char *uart1_mux_p[] __initconst = { "osc26m", "pclk", };
+static const char *uart2_mux_p[] __initconst = { "osc26m", "pclk", };
+static const char *uart3_mux_p[] __initconst = { "osc26m", "pclk", };
+static const char *uart4_mux_p[] __initconst = { "osc26m", "pclk", };
+static const char *spi0_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
+static const char *spi1_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
+static const char *spi2_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
/* share axi parent */
-static const char *saxi_mux_p[] __initdata = { "armpll3", "armpll2", };
-static const char *pwm0_mux_p[] __initdata = { "osc32k", "osc26m", };
-static const char *pwm1_mux_p[] __initdata = { "osc32k", "osc26m", };
-static const char *sd_mux_p[] __initdata = { "armpll2", "armpll3", };
-static const char *mmc1_mux_p[] __initdata = { "armpll2", "armpll3", };
-static const char *mmc1_mux2_p[] __initdata = { "osc26m", "mmc1_div", };
-static const char *g2d_mux_p[] __initdata = { "armpll2", "armpll3", };
-static const char *venc_mux_p[] __initdata = { "armpll2", "armpll3", };
-static const char *vdec_mux_p[] __initdata = { "armpll2", "armpll3", };
-static const char *vpp_mux_p[] __initdata = { "armpll2", "armpll3", };
-static const char *edc0_mux_p[] __initdata = { "armpll2", "armpll3", };
-static const char *ldi0_mux_p[] __initdata = { "armpll2", "armpll4",
+static const char *saxi_mux_p[] __initconst = { "armpll3", "armpll2", };
+static const char *pwm0_mux_p[] __initconst = { "osc32k", "osc26m", };
+static const char *pwm1_mux_p[] __initconst = { "osc32k", "osc26m", };
+static const char *sd_mux_p[] __initconst = { "armpll2", "armpll3", };
+static const char *mmc1_mux_p[] __initconst = { "armpll2", "armpll3", };
+static const char *mmc1_mux2_p[] __initconst = { "osc26m", "mmc1_div", };
+static const char *g2d_mux_p[] __initconst = { "armpll2", "armpll3", };
+static const char *venc_mux_p[] __initconst = { "armpll2", "armpll3", };
+static const char *vdec_mux_p[] __initconst = { "armpll2", "armpll3", };
+static const char *vpp_mux_p[] __initconst = { "armpll2", "armpll3", };
+static const char *edc0_mux_p[] __initconst = { "armpll2", "armpll3", };
+static const char *ldi0_mux_p[] __initconst = { "armpll2", "armpll4",
"armpll3", "armpll5", };
-static const char *edc1_mux_p[] __initdata = { "armpll2", "armpll3", };
-static const char *ldi1_mux_p[] __initdata = { "armpll2", "armpll4",
+static const char *edc1_mux_p[] __initconst = { "armpll2", "armpll3", };
+static const char *ldi1_mux_p[] __initconst = { "armpll2", "armpll4",
"armpll3", "armpll5", };
-static const char *rclk_hsic_p[] __initdata = { "armpll3", "armpll2", };
-static const char *mmc2_mux_p[] __initdata = { "armpll2", "armpll3", };
-static const char *mmc3_mux_p[] __initdata = { "armpll2", "armpll3", };
+static const char *rclk_hsic_p[] __initconst = { "armpll3", "armpll2", };
+static const char *mmc2_mux_p[] __initconst = { "armpll2", "armpll3", };
+static const char *mmc3_mux_p[] __initconst = { "armpll2", "armpll3", };

/* fixed rate clocks */
--
1.9.1

2014-11-11 13:55:54

by Haojian Zhuang

[permalink] [raw]

Subject: Re: [PATCH] clk: hi3620: Move const initdata into correct code section

On 10 November 2014 20:58, Bintian Wang <[email protected]> wrote:
> Use __initconst instead of __initdata for constant init data.
>
> Signed-off-by: Bintian Wang <[email protected]>
> ---
> drivers/clk/hisilicon/clk-hi3620.c | 70 +++++++++++++++++++-------------------
> 1 file changed, 35 insertions(+), 35 deletions(-)
>
> diff --git a/drivers/clk/hisilicon/clk-hi3620.c b/drivers/clk/hisilicon/clk-hi3620.c
> index 339945d..640ea33 100644
> --- a/drivers/clk/hisilicon/clk-hi3620.c
> +++ b/drivers/clk/hisilicon/clk-hi3620.c
> @@ -38,44 +38,44 @@
> #include "clk.h"
>
> /* clock parent list */
> -static const char *timer0_mux_p[] __initdata = { "osc32k", "timerclk01", };

Acked-by: Haojian Zhuang <[email protected]>

2014-11-20 00:57:32

by Mike Turquette

[permalink] [raw]

Subject: Re: [PATCH] clk: hi3620: Move const initdata into correct code section

Quoting Bintian Wang (2014-11-10 04:58:31)
> Use __initconst instead of __initdata for constant init data.
>
> Signed-off-by: Bintian Wang <[email protected]>

Applied.

Thanks,
Mike

> ---
> drivers/clk/hisilicon/clk-hi3620.c | 70 +++++++++++++++++++-------------------
> 1 file changed, 35 insertions(+), 35 deletions(-)
>
> diff --git a/drivers/clk/hisilicon/clk-hi3620.c b/drivers/clk/hisilicon/clk-hi3620.c
> index 339945d..640ea33 100644
> --- a/drivers/clk/hisilicon/clk-hi3620.c
> +++ b/drivers/clk/hisilicon/clk-hi3620.c
> @@ -38,44 +38,44 @@
> #include "clk.h"
>
> /* clock parent list */
> -static const char *timer0_mux_p[] __initdata = { "osc32k", "timerclk01", };
> -static const char *timer1_mux_p[] __initdata = { "osc32k", "timerclk01", };
> -static const char *timer2_mux_p[] __initdata = { "osc32k", "timerclk23", };
> -static const char *timer3_mux_p[] __initdata = { "osc32k", "timerclk23", };
> -static const char *timer4_mux_p[] __initdata = { "osc32k", "timerclk45", };
> -static const char *timer5_mux_p[] __initdata = { "osc32k", "timerclk45", };
> -static const char *timer6_mux_p[] __initdata = { "osc32k", "timerclk67", };
> -static const char *timer7_mux_p[] __initdata = { "osc32k", "timerclk67", };
> -static const char *timer8_mux_p[] __initdata = { "osc32k", "timerclk89", };
> -static const char *timer9_mux_p[] __initdata = { "osc32k", "timerclk89", };
> -static const char *uart0_mux_p[] __initdata = { "osc26m", "pclk", };
> -static const char *uart1_mux_p[] __initdata = { "osc26m", "pclk", };
> -static const char *uart2_mux_p[] __initdata = { "osc26m", "pclk", };
> -static const char *uart3_mux_p[] __initdata = { "osc26m", "pclk", };
> -static const char *uart4_mux_p[] __initdata = { "osc26m", "pclk", };
> -static const char *spi0_mux_p[] __initdata = { "osc26m", "rclk_cfgaxi", };
> -static const char *spi1_mux_p[] __initdata = { "osc26m", "rclk_cfgaxi", };
> -static const char *spi2_mux_p[] __initdata = { "osc26m", "rclk_cfgaxi", };
> +static const char *timer0_mux_p[] __initconst = { "osc32k", "timerclk01", };
> +static const char *timer1_mux_p[] __initconst = { "osc32k", "timerclk01", };
> +static const char *timer2_mux_p[] __initconst = { "osc32k", "timerclk23", };
> +static const char *timer3_mux_p[] __initconst = { "osc32k", "timerclk23", };
> +static const char *timer4_mux_p[] __initconst = { "osc32k", "timerclk45", };
> +static const char *timer5_mux_p[] __initconst = { "osc32k", "timerclk45", };
> +static const char *timer6_mux_p[] __initconst = { "osc32k", "timerclk67", };
> +static const char *timer7_mux_p[] __initconst = { "osc32k", "timerclk67", };
> +static const char *timer8_mux_p[] __initconst = { "osc32k", "timerclk89", };
> +static const char *timer9_mux_p[] __initconst = { "osc32k", "timerclk89", };
> +static const char *uart0_mux_p[] __initconst = { "osc26m", "pclk", };
> +static const char *uart1_mux_p[] __initconst = { "osc26m", "pclk", };
> +static const char *uart2_mux_p[] __initconst = { "osc26m", "pclk", };
> +static const char *uart3_mux_p[] __initconst = { "osc26m", "pclk", };
> +static const char *uart4_mux_p[] __initconst = { "osc26m", "pclk", };
> +static const char *spi0_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
> +static const char *spi1_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
> +static const char *spi2_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
> /* share axi parent */
> -static const char *saxi_mux_p[] __initdata = { "armpll3", "armpll2", };
> -static const char *pwm0_mux_p[] __initdata = { "osc32k", "osc26m", };
> -static const char *pwm1_mux_p[] __initdata = { "osc32k", "osc26m", };
> -static const char *sd_mux_p[] __initdata = { "armpll2", "armpll3", };
> -static const char *mmc1_mux_p[] __initdata = { "armpll2", "armpll3", };
> -static const char *mmc1_mux2_p[] __initdata = { "osc26m", "mmc1_div", };
> -static const char *g2d_mux_p[] __initdata = { "armpll2", "armpll3", };
> -static const char *venc_mux_p[] __initdata = { "armpll2", "armpll3", };
> -static const char *vdec_mux_p[] __initdata = { "armpll2", "armpll3", };
> -static const char *vpp_mux_p[] __initdata = { "armpll2", "armpll3", };
> -static const char *edc0_mux_p[] __initdata = { "armpll2", "armpll3", };
> -static const char *ldi0_mux_p[] __initdata = { "armpll2", "armpll4",
> +static const char *saxi_mux_p[] __initconst = { "armpll3", "armpll2", };
> +static const char *pwm0_mux_p[] __initconst = { "osc32k", "osc26m", };
> +static const char *pwm1_mux_p[] __initconst = { "osc32k", "osc26m", };
> +static const char *sd_mux_p[] __initconst = { "armpll2", "armpll3", };
> +static const char *mmc1_mux_p[] __initconst = { "armpll2", "armpll3", };
> +static const char *mmc1_mux2_p[] __initconst = { "osc26m", "mmc1_div", };
> +static const char *g2d_mux_p[] __initconst = { "armpll2", "armpll3", };
> +static const char *venc_mux_p[] __initconst = { "armpll2", "armpll3", };
> +static const char *vdec_mux_p[] __initconst = { "armpll2", "armpll3", };
> +static const char *vpp_mux_p[] __initconst = { "armpll2", "armpll3", };
> +static const char *edc0_mux_p[] __initconst = { "armpll2", "armpll3", };
> +static const char *ldi0_mux_p[] __initconst = { "armpll2", "armpll4",
> "armpll3", "armpll5", };
> -static const char *edc1_mux_p[] __initdata = { "armpll2", "armpll3", };
> -static const char *ldi1_mux_p[] __initdata = { "armpll2", "armpll4",
> +static const char *edc1_mux_p[] __initconst = { "armpll2", "armpll3", };
> +static const char *ldi1_mux_p[] __initconst = { "armpll2", "armpll4",
> "armpll3", "armpll5", };
> -static const char *rclk_hsic_p[] __initdata = { "armpll3", "armpll2", };
> -static const char *mmc2_mux_p[] __initdata = { "armpll2", "armpll3", };
> -static const char *mmc3_mux_p[] __initdata = { "armpll2", "armpll3", };
> +static const char *rclk_hsic_p[] __initconst = { "armpll3", "armpll2", };
> +static const char *mmc2_mux_p[] __initconst = { "armpll2", "armpll3", };
> +static const char *mmc3_mux_p[] __initconst = { "armpll2", "armpll3", };
>
>
> /* fixed rate clocks */
> --
> 1.9.1
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/