| Message ID | 1387229127-7605-1-git-send-email-b.brezillon@overkiz.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 16/12/2013 22:25, Boris BREZILLON : > Fix pmc_clk_ids data type attribute (__initdata -> __initconst). > > Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com> > Reported-by: Fengguang Wu <fengguang.wu@intel.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> I take it in at91-3.14-cleanup2 branch and send it upstream through arm-soc like any other CCF material for AT91 for the 3.14 release. I guess that even without Mike Acked-by, this little fix can follow this path. Bye, > --- > drivers/clk/at91/pmc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c > index 7b9db60..4c03eda 100644 > --- a/drivers/clk/at91/pmc.c > +++ b/drivers/clk/at91/pmc.c > @@ -228,7 +228,7 @@ out_free_pmc: > return NULL; > } > > -static const struct of_device_id pmc_clk_ids[] __initdata = { > +static const struct of_device_id pmc_clk_ids[] __initconst = { > /* Main clock */ > { > .compatible = "atmel,at91rm9200-clk-main", >
Quoting Boris BREZILLON (2013-12-16 13:25:27) > Fix pmc_clk_ids data type attribute (__initdata -> __initconst). > > Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com> > Reported-by: Fengguang Wu <fengguang.wu@intel.com> Acked-by: Mike Turquette <mturquette@linaro.org> > --- > drivers/clk/at91/pmc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c > index 7b9db60..4c03eda 100644 > --- a/drivers/clk/at91/pmc.c > +++ b/drivers/clk/at91/pmc.c > @@ -228,7 +228,7 @@ out_free_pmc: > return NULL; > } > > -static const struct of_device_id pmc_clk_ids[] __initdata = { > +static const struct of_device_id pmc_clk_ids[] __initconst = { > /* Main clock */ > { > .compatible = "atmel,at91rm9200-clk-main", > -- > 1.7.9.5 >
Quoting Nicolas Ferre (2013-12-17 01:33:04) > On 16/12/2013 22:25, Boris BREZILLON : > > Fix pmc_clk_ids data type attribute (__initdata -> __initconst). > > > > Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com> > > Reported-by: Fengguang Wu <fengguang.wu@intel.com> > > Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > > I take it in at91-3.14-cleanup2 branch and send it upstream through > arm-soc like any other CCF material for AT91 for the 3.14 release. > > I guess that even without Mike Acked-by, this little fix can follow this > path. I can take it into the clk tree if you prefer. Regards, Mike > > Bye, > > > --- > > drivers/clk/at91/pmc.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c > > index 7b9db60..4c03eda 100644 > > --- a/drivers/clk/at91/pmc.c > > +++ b/drivers/clk/at91/pmc.c > > @@ -228,7 +228,7 @@ out_free_pmc: > > return NULL; > > } > > > > -static const struct of_device_id pmc_clk_ids[] __initdata = { > > +static const struct of_device_id pmc_clk_ids[] __initconst = { > > /* Main clock */ > > { > > .compatible = "atmel,at91rm9200-clk-main", > > > > > -- > Nicolas Ferre
On 19/12/2013 08:57, Mike Turquette : > Quoting Nicolas Ferre (2013-12-17 01:33:04) >> On 16/12/2013 22:25, Boris BREZILLON : >>> Fix pmc_clk_ids data type attribute (__initdata -> __initconst). >>> >>> Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com> >>> Reported-by: Fengguang Wu <fengguang.wu@intel.com> >> >> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> >> >> I take it in at91-3.14-cleanup2 branch and send it upstream through >> arm-soc like any other CCF material for AT91 for the 3.14 release. >> >> I guess that even without Mike Acked-by, this little fix can follow this >> path. > > I can take it into the clk tree if you prefer. Do not bother Mike, I take this little one for having all CCF AT91 material in one place before 3.14-rc1. After that milestone, we will take the usual patch using your tree. Bye, >>> --- >>> drivers/clk/at91/pmc.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c >>> index 7b9db60..4c03eda 100644 >>> --- a/drivers/clk/at91/pmc.c >>> +++ b/drivers/clk/at91/pmc.c >>> @@ -228,7 +228,7 @@ out_free_pmc: >>> return NULL; >>> } >>> >>> -static const struct of_device_id pmc_clk_ids[] __initdata = { >>> +static const struct of_device_id pmc_clk_ids[] __initconst = { >>> /* Main clock */ >>> { >>> .compatible = "atmel,at91rm9200-clk-main", >>> >> >> >> -- >> Nicolas Ferre >
diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c index 7b9db60..4c03eda 100644 --- a/drivers/clk/at91/pmc.c +++ b/drivers/clk/at91/pmc.c @@ -228,7 +228,7 @@ out_free_pmc: return NULL; } -static const struct of_device_id pmc_clk_ids[] __initdata = { +static const struct of_device_id pmc_clk_ids[] __initconst = { /* Main clock */ { .compatible = "atmel,at91rm9200-clk-main",
Fix pmc_clk_ids data type attribute (__initdata -> __initconst). Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com> Reported-by: Fengguang Wu <fengguang.wu@intel.com> --- drivers/clk/at91/pmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)