* [PATCH] gpio, bcm-kona, LLVMLinux: Remove use of __initconst
@ 2014-09-23 19:30 behanw
2014-09-23 21:20 ` Matt Porter
2014-09-23 21:29 ` Matt Porter
0 siblings, 2 replies; 10+ messages in thread
From: behanw @ 2014-09-23 19:30 UTC (permalink / raw)
To: bcm, chris, gnurou, linus.walleij, mporter, ulf.hansson
Cc: bcm-kernel-feedback-list, linux-gpio, linux-kernel, linux-mmc,
rjui, Behan Webster
From: Behan Webster <behanw@converseincode.com>
The __initconst is in the wrong place, and when moved to the correct place
it uncovers an error where the variable is used by non-init data structures.
Instead merely make them const and put the const in the right spot.
Signed-off-by: Behan Webster <behanw@converseincode.com>
Reviewed-by: Mark Charlebois <charlebm@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/gpio/gpio-bcm-kona.c | 2 +-
drivers/mmc/host/sdhci-bcm-kona.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c
index 3f6b33c..de0801e 100644
--- a/drivers/gpio/gpio-bcm-kona.c
+++ b/drivers/gpio/gpio-bcm-kona.c
@@ -496,7 +496,7 @@ static struct irq_chip bcm_gpio_irq_chip = {
.irq_release_resources = bcm_kona_gpio_irq_relres,
};
-static struct __initconst of_device_id bcm_kona_gpio_of_match[] = {
+static struct of_device_id const bcm_kona_gpio_of_match[] = {
{ .compatible = "brcm,kona-gpio" },
{}
};
diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c
index dd780c3..4bb06c8 100644
--- a/drivers/mmc/host/sdhci-bcm-kona.c
+++ b/drivers/mmc/host/sdhci-bcm-kona.c
@@ -225,7 +225,7 @@ static struct sdhci_pltfm_data sdhci_pltfm_data_kona = {
SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
};
-static struct __initconst of_device_id sdhci_bcm_kona_of_match[] = {
+static struct of_device_id const sdhci_bcm_kona_of_match[] = {
{ .compatible = "brcm,kona-sdhci"},
{ .compatible = "bcm,kona-sdhci"}, /* deprecated name */
{}
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH] gpio, bcm-kona, LLVMLinux: Remove use of __initconst
2014-09-23 19:30 [PATCH] gpio, bcm-kona, LLVMLinux: Remove use of __initconst behanw
@ 2014-09-23 21:20 ` Matt Porter
2014-09-23 21:29 ` Matt Porter
1 sibling, 0 replies; 10+ messages in thread
From: Matt Porter @ 2014-09-23 21:20 UTC (permalink / raw)
To: behanw
Cc: bcm, chris, gnurou, linus.walleij, ulf.hansson,
bcm-kernel-feedback-list, linux-gpio, linux-kernel, linux-mmc,
rjui
On Tue, Sep 23, 2014 at 12:30:16PM -0700, behanw@converseincode.com wrote:
> From: Behan Webster <behanw@converseincode.com>
>
> The __initconst is in the wrong place, and when moved to the correct place
> it uncovers an error where the variable is used by non-init data structures.
>
> Instead merely make them const and put the const in the right spot.
>
> Signed-off-by: Behan Webster <behanw@converseincode.com>
> Reviewed-by: Mark Charlebois <charlebm@gmail.com>
> Acked-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/gpio/gpio-bcm-kona.c | 2 +-
> drivers/mmc/host/sdhci-bcm-kona.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c
> index 3f6b33c..de0801e 100644
> --- a/drivers/gpio/gpio-bcm-kona.c
> +++ b/drivers/gpio/gpio-bcm-kona.c
> @@ -496,7 +496,7 @@ static struct irq_chip bcm_gpio_irq_chip = {
> .irq_release_resources = bcm_kona_gpio_irq_relres,
> };
>
> -static struct __initconst of_device_id bcm_kona_gpio_of_match[] = {
> +static struct of_device_id const bcm_kona_gpio_of_match[] = {
> { .compatible = "brcm,kona-gpio" },
> {}
> };
> diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c
> index dd780c3..4bb06c8 100644
> --- a/drivers/mmc/host/sdhci-bcm-kona.c
> +++ b/drivers/mmc/host/sdhci-bcm-kona.c
> @@ -225,7 +225,7 @@ static struct sdhci_pltfm_data sdhci_pltfm_data_kona = {
> SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
> };
>
> -static struct __initconst of_device_id sdhci_bcm_kona_of_match[] = {
> +static struct of_device_id const sdhci_bcm_kona_of_match[] = {
> { .compatible = "brcm,kona-sdhci"},
> { .compatible = "bcm,kona-sdhci"}, /* deprecated name */
> {}
Acked-by: Matt Porter <mporter@linaro.org>
-Matt
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] gpio, bcm-kona, LLVMLinux: Remove use of __initconst
2014-09-23 19:30 [PATCH] gpio, bcm-kona, LLVMLinux: Remove use of __initconst behanw
2014-09-23 21:20 ` Matt Porter
@ 2014-09-23 21:29 ` Matt Porter
2014-09-23 22:55 ` [PATCH v2 1/2] " behanw
2014-09-23 22:59 ` [PATCH] " Behan Webster
1 sibling, 2 replies; 10+ messages in thread
From: Matt Porter @ 2014-09-23 21:29 UTC (permalink / raw)
To: behanw
Cc: bcm, chris, gnurou, linus.walleij, ulf.hansson,
bcm-kernel-feedback-list, linux-gpio, linux-kernel, linux-mmc,
rjui
On Tue, Sep 23, 2014 at 12:30:16PM -0700, behanw@converseincode.com wrote:
> From: Behan Webster <behanw@converseincode.com>
>
> The __initconst is in the wrong place, and when moved to the correct place
> it uncovers an error where the variable is used by non-init data structures.
>
> Instead merely make them const and put the const in the right spot.
>
> Signed-off-by: Behan Webster <behanw@converseincode.com>
> Reviewed-by: Mark Charlebois <charlebm@gmail.com>
> Acked-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/gpio/gpio-bcm-kona.c | 2 +-
> drivers/mmc/host/sdhci-bcm-kona.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
As mentioned on IRC, Linus, Chris, and Ulf probably would like this
split to go into each respective tree.
-Matt
>
> diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c
> index 3f6b33c..de0801e 100644
> --- a/drivers/gpio/gpio-bcm-kona.c
> +++ b/drivers/gpio/gpio-bcm-kona.c
> @@ -496,7 +496,7 @@ static struct irq_chip bcm_gpio_irq_chip = {
> .irq_release_resources = bcm_kona_gpio_irq_relres,
> };
>
> -static struct __initconst of_device_id bcm_kona_gpio_of_match[] = {
> +static struct of_device_id const bcm_kona_gpio_of_match[] = {
> { .compatible = "brcm,kona-gpio" },
> {}
> };
> diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c
> index dd780c3..4bb06c8 100644
> --- a/drivers/mmc/host/sdhci-bcm-kona.c
> +++ b/drivers/mmc/host/sdhci-bcm-kona.c
> @@ -225,7 +225,7 @@ static struct sdhci_pltfm_data sdhci_pltfm_data_kona = {
> SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
> };
>
> -static struct __initconst of_device_id sdhci_bcm_kona_of_match[] = {
> +static struct of_device_id const sdhci_bcm_kona_of_match[] = {
> { .compatible = "brcm,kona-sdhci"},
> { .compatible = "bcm,kona-sdhci"}, /* deprecated name */
> {}
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH v2 1/2] gpio, bcm-kona, LLVMLinux: Remove use of __initconst
2014-09-23 21:29 ` Matt Porter
@ 2014-09-23 22:55 ` behanw
2014-09-23 22:55 ` [PATCH v2 2/2] mmc, sdhci, " behanw
2014-09-24 11:40 ` [PATCH v2 1/2] gpio, " Linus Walleij
2014-09-23 22:59 ` [PATCH] " Behan Webster
1 sibling, 2 replies; 10+ messages in thread
From: behanw @ 2014-09-23 22:55 UTC (permalink / raw)
To: bcm, chris, gnurou, linus.walleij, mporter, ulf.hansson
Cc: bcm-kernel-feedback-list, linux-gpio, linux-kernel, linux-mmc,
rjui, Behan Webster
From: Behan Webster <behanw@converseincode.com>
The __initconst is in the wrong place, and when moved to the correct place
it uncovers an error where the variable is used by non-init data structures.
Instead merely make them const and put the const in the right spot.
Signed-off-by: Behan Webster <behanw@converseincode.com>
Reviewed-by: Mark Charlebois <charlebm@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Matt Porter <mporter@linaro.org>
---
drivers/gpio/gpio-bcm-kona.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c
index 3f6b33c..de0801e 100644
--- a/drivers/gpio/gpio-bcm-kona.c
+++ b/drivers/gpio/gpio-bcm-kona.c
@@ -496,7 +496,7 @@ static struct irq_chip bcm_gpio_irq_chip = {
.irq_release_resources = bcm_kona_gpio_irq_relres,
};
-static struct __initconst of_device_id bcm_kona_gpio_of_match[] = {
+static struct of_device_id const bcm_kona_gpio_of_match[] = {
{ .compatible = "brcm,kona-gpio" },
{}
};
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v2 2/2] mmc, sdhci, bcm-kona, LLVMLinux: Remove use of __initconst
2014-09-23 22:55 ` [PATCH v2 1/2] " behanw
@ 2014-09-23 22:55 ` behanw
2014-09-24 9:22 ` Arnd Bergmann
2014-09-24 11:40 ` [PATCH v2 1/2] gpio, " Linus Walleij
1 sibling, 1 reply; 10+ messages in thread
From: behanw @ 2014-09-23 22:55 UTC (permalink / raw)
To: bcm, chris, gnurou, linus.walleij, mporter, ulf.hansson
Cc: bcm-kernel-feedback-list, linux-gpio, linux-kernel, linux-mmc,
rjui, Behan Webster
From: Behan Webster <behanw@converseincode.com>
The __initconst is in the wrong place, and when moved to the correct place
it uncovers an error where the variable is used by non-init data structures.
Instead merely make them const and put the const in the right spot.
Signed-off-by: Behan Webster <behanw@converseincode.com>
Reviewed-by: Mark Charlebois <charlebm@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Matt Porter <mporter@linaro.org>
---
drivers/mmc/host/sdhci-bcm-kona.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c
index dd780c3..4bb06c8 100644
--- a/drivers/mmc/host/sdhci-bcm-kona.c
+++ b/drivers/mmc/host/sdhci-bcm-kona.c
@@ -225,7 +225,7 @@ static struct sdhci_pltfm_data sdhci_pltfm_data_kona = {
SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
};
-static struct __initconst of_device_id sdhci_bcm_kona_of_match[] = {
+static struct of_device_id const sdhci_bcm_kona_of_match[] = {
{ .compatible = "brcm,kona-sdhci"},
{ .compatible = "bcm,kona-sdhci"}, /* deprecated name */
{}
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v2 2/2] mmc, sdhci, bcm-kona, LLVMLinux: Remove use of __initconst
2014-09-23 22:55 ` [PATCH v2 2/2] mmc, sdhci, " behanw
@ 2014-09-24 9:22 ` Arnd Bergmann
2014-09-24 18:21 ` Behan Webster
0 siblings, 1 reply; 10+ messages in thread
From: Arnd Bergmann @ 2014-09-24 9:22 UTC (permalink / raw)
To: behanw
Cc: bcm, chris, gnurou, linus.walleij, mporter, ulf.hansson,
bcm-kernel-feedback-list, linux-gpio, linux-kernel, linux-mmc,
rjui
On Tuesday 23 September 2014 15:55:08 behanw@converseincode.com wrote:
> --- a/drivers/mmc/host/sdhci-bcm-kona.c
> +++ b/drivers/mmc/host/sdhci-bcm-kona.c
> @@ -225,7 +225,7 @@ static struct sdhci_pltfm_data sdhci_pltfm_data_kona = {
> SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
> };
>
> -static struct __initconst of_device_id sdhci_bcm_kona_of_match[] = {
> +static struct of_device_id const sdhci_bcm_kona_of_match[] = {
> { .compatible = "brcm,kona-sdhci"},
> { .compatible = "bcm,kona-sdhci"}, /* deprecated name */
> {}
>
Sorry for giving you trouble over such a simple patch (especially
one that I have acked already), but I just noticed that this is
not following the common style we use in the kernel.
Almost everywhere in Linux, we use
static const struct of_device_id sdhci_bcm_kona_of_match[] = {
not
static struct of_device_id const sdhci_bcm_kona_of_match[] = {
AFAICT they behave in identical ways, but the first one seems
easier to read for someone familiar with kernel code.
Arnd
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v2 2/2] mmc, sdhci, bcm-kona, LLVMLinux: Remove use of __initconst
2014-09-24 9:22 ` Arnd Bergmann
@ 2014-09-24 18:21 ` Behan Webster
2014-09-25 8:18 ` Linus Walleij
0 siblings, 1 reply; 10+ messages in thread
From: Behan Webster @ 2014-09-24 18:21 UTC (permalink / raw)
To: Arnd Bergmann
Cc: bcm, chris, gnurou, linus.walleij, mporter, ulf.hansson,
bcm-kernel-feedback-list, linux-gpio, linux-kernel, linux-mmc,
rjui
On 09/24/14 02:22, Arnd Bergmann wrote:
> On Tuesday 23 September 2014 15:55:08 behanw@converseincode.com wrote:
>> --- a/drivers/mmc/host/sdhci-bcm-kona.c
>> +++ b/drivers/mmc/host/sdhci-bcm-kona.c
>> @@ -225,7 +225,7 @@ static struct sdhci_pltfm_data sdhci_pltfm_data_kona = {
>> SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
>> };
>>
>> -static struct __initconst of_device_id sdhci_bcm_kona_of_match[] = {
>> +static struct of_device_id const sdhci_bcm_kona_of_match[] = {
>> { .compatible = "brcm,kona-sdhci"},
>> { .compatible = "bcm,kona-sdhci"}, /* deprecated name */
>> {}
>>
> Sorry for giving you trouble over such a simple patch (especially
> one that I have acked already), but I just noticed that this is
> not following the common style we use in the kernel.
It's all good. It's not like you haven't saved me a tonne of time
already! :)
> Almost everywhere in Linux, we use
>
> static const struct of_device_id sdhci_bcm_kona_of_match[] = {
>
> not
>
> static struct of_device_id const sdhci_bcm_kona_of_match[] = {
True enough. I put the const where I did to be in keeping with the
intent of __initconst, making the array const instead of the contained type.
> AFAICT they behave in identical ways,
Indeed. For C in both cases the resulting array of struct of_device_id
ends up in .rodata, so functionally equivalent.
> but the first one seems
> easier to read for someone familiar with kernel code.
No worries. Happy to post a v3.
Linus Walleij: Would you like me to respin the "gpio, bcm-kona,
LLVMLinux: Remove use of __initconst" patch as well?
Behan
--
Behan Webster
behanw@converseincode.com
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v2 2/2] mmc, sdhci, bcm-kona, LLVMLinux: Remove use of __initconst
2014-09-24 18:21 ` Behan Webster
@ 2014-09-25 8:18 ` Linus Walleij
0 siblings, 0 replies; 10+ messages in thread
From: Linus Walleij @ 2014-09-25 8:18 UTC (permalink / raw)
To: Behan Webster
Cc: Arnd Bergmann, Christian Daudt, Chris Ball, Alexandre Courbot,
Matt Porter, Ulf Hansson, bcm-kernel-feedback-list,
linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-mmc@vger.kernel.org, Ray Jui
On Wed, Sep 24, 2014 at 8:21 PM, Behan Webster
<behanw@converseincode.com> wrote:
> On 09/24/14 02:22, Arnd Bergmann wrote:
>> but the first one seems
>> easier to read for someone familiar with kernel code.
>
> No worries. Happy to post a v3.
>
> Linus Walleij: Would you like me to respin the "gpio, bcm-kona, LLVMLinux:
> Remove use of __initconst" patch as well?
No it's already applied.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 1/2] gpio, bcm-kona, LLVMLinux: Remove use of __initconst
2014-09-23 22:55 ` [PATCH v2 1/2] " behanw
2014-09-23 22:55 ` [PATCH v2 2/2] mmc, sdhci, " behanw
@ 2014-09-24 11:40 ` Linus Walleij
1 sibling, 0 replies; 10+ messages in thread
From: Linus Walleij @ 2014-09-24 11:40 UTC (permalink / raw)
To: behanw
Cc: Christian Daudt, Chris Ball, Alexandre Courbot, Matt Porter,
Ulf Hansson, bcm-kernel-feedback-list, linux-gpio@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Ray Jui,
Mark Charlebois
On Wed, Sep 24, 2014 at 12:55 AM, <behanw@converseincode.com> wrote:
> From: Behan Webster <behanw@converseincode.com>
>
> The __initconst is in the wrong place, and when moved to the correct place
> it uncovers an error where the variable is used by non-init data structures.
>
> Instead merely make them const and put the const in the right spot.
>
> Signed-off-by: Behan Webster <behanw@converseincode.com>
> Reviewed-by: Mark Charlebois <charlebm@gmail.com>
> Acked-by: Arnd Bergmann <arnd@arndb.de>
> Acked-by: Matt Porter <mporter@linaro.org>
Patch applied.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] gpio, bcm-kona, LLVMLinux: Remove use of __initconst
2014-09-23 21:29 ` Matt Porter
2014-09-23 22:55 ` [PATCH v2 1/2] " behanw
@ 2014-09-23 22:59 ` Behan Webster
1 sibling, 0 replies; 10+ messages in thread
From: Behan Webster @ 2014-09-23 22:59 UTC (permalink / raw)
To: Matt Porter
Cc: bcm, chris, gnurou, linus.walleij, ulf.hansson,
bcm-kernel-feedback-list, linux-gpio, linux-kernel, linux-mmc,
rjui
On 09/23/14 14:29, Matt Porter wrote:
> On Tue, Sep 23, 2014 at 12:30:16PM -0700, behanw@converseincode.com wrote:
>> From: Behan Webster <behanw@converseincode.com>
>>
>> The __initconst is in the wrong place, and when moved to the correct place
>> it uncovers an error where the variable is used by non-init data structures.
>>
>> Instead merely make them const and put the const in the right spot.
>>
>> Signed-off-by: Behan Webster <behanw@converseincode.com>
>> Reviewed-by: Mark Charlebois <charlebm@gmail.com>
>> Acked-by: Arnd Bergmann <arnd@arndb.de>
>> ---
>> drivers/gpio/gpio-bcm-kona.c | 2 +-
>> drivers/mmc/host/sdhci-bcm-kona.c | 2 +-
>> 2 files changed, 2 insertions(+), 2 deletions(-)
> As mentioned on IRC, Linus, Chris, and Ulf probably would like this
> split to go into each respective tree.
Thanks Matt.
I reposted as a 2 patch series. Strictly speaking one patch is for each
tree.
Behan
--
Behan Webster
behanw@converseincode.com
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2014-09-25 8:18 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-23 19:30 [PATCH] gpio, bcm-kona, LLVMLinux: Remove use of __initconst behanw
2014-09-23 21:20 ` Matt Porter
2014-09-23 21:29 ` Matt Porter
2014-09-23 22:55 ` [PATCH v2 1/2] " behanw
2014-09-23 22:55 ` [PATCH v2 2/2] mmc, sdhci, " behanw
2014-09-24 9:22 ` Arnd Bergmann
2014-09-24 18:21 ` Behan Webster
2014-09-25 8:18 ` Linus Walleij
2014-09-24 11:40 ` [PATCH v2 1/2] gpio, " Linus Walleij
2014-09-23 22:59 ` [PATCH] " Behan Webster
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).