2020-12-30 15:45:19

by Arnd Bergmann

[permalink] [raw]
Subject: [PATCH] i3c/master/mipi-i3c-hci: re-fix __maybe_unused attribute

From: Arnd Bergmann <[email protected]>

clang warns because the added __maybe_unused attribute is in
the wrong place:

drivers/i3c/master/mipi-i3c-hci/core.c:780:21: error: attribute declaration must precede definition [-Werror,-Wignored-attributes]
static const struct __maybe_unused of_device_id i3c_hci_of_match[] = {
^
include/linux/compiler_attributes.h:267:56: note: expanded

Fixes: 95393f3e07ab ("i3c/master/mipi-i3c-hci: quiet maybe-unused variable warning")
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/i3c/master/mipi-i3c-hci/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/i3c/master/mipi-i3c-hci/core.c b/drivers/i3c/master/mipi-i3c-hci/core.c
index 500abd27fb22..1b73647cc3b1 100644
--- a/drivers/i3c/master/mipi-i3c-hci/core.c
+++ b/drivers/i3c/master/mipi-i3c-hci/core.c
@@ -777,7 +777,7 @@ static int i3c_hci_remove(struct platform_device *pdev)
return 0;
}

-static const struct __maybe_unused of_device_id i3c_hci_of_match[] = {
+static const __maybe_unused struct of_device_id i3c_hci_of_match[] = {
{ .compatible = "mipi-i3c-hci", },
{},
};
--
2.29.2


2020-12-30 21:26:50

by Nicolas Pitre

[permalink] [raw]
Subject: Re: [PATCH] i3c/master/mipi-i3c-hci: re-fix __maybe_unused attribute

On Wed, 30 Dec 2020, Arnd Bergmann wrote:

> From: Arnd Bergmann <[email protected]>
>
> clang warns because the added __maybe_unused attribute is in
> the wrong place:
>
> drivers/i3c/master/mipi-i3c-hci/core.c:780:21: error: attribute declaration must precede definition [-Werror,-Wignored-attributes]
> static const struct __maybe_unused of_device_id i3c_hci_of_match[] = {
> ^
> include/linux/compiler_attributes.h:267:56: note: expanded
>
> Fixes: 95393f3e07ab ("i3c/master/mipi-i3c-hci: quiet maybe-unused variable warning")
> Signed-off-by: Arnd Bergmann <[email protected]>

Acked-by: Nicolas Pitre <[email protected]>

This might be the 3rd patch from 3 different people fixing the same
thing. Looks like I3C maintainer is on vacation. Please feel free to
send this trivial fix upstream some other way.

> ---
> drivers/i3c/master/mipi-i3c-hci/core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/i3c/master/mipi-i3c-hci/core.c b/drivers/i3c/master/mipi-i3c-hci/core.c
> index 500abd27fb22..1b73647cc3b1 100644
> --- a/drivers/i3c/master/mipi-i3c-hci/core.c
> +++ b/drivers/i3c/master/mipi-i3c-hci/core.c
> @@ -777,7 +777,7 @@ static int i3c_hci_remove(struct platform_device *pdev)
> return 0;
> }
>
> -static const struct __maybe_unused of_device_id i3c_hci_of_match[] = {
> +static const __maybe_unused struct of_device_id i3c_hci_of_match[] = {
> { .compatible = "mipi-i3c-hci", },
> {},
> };
> --
> 2.29.2
>
>

2020-12-30 21:43:14

by Alexandre Belloni

[permalink] [raw]
Subject: Re: [PATCH] i3c/master/mipi-i3c-hci: re-fix __maybe_unused attribute

On 30/12/2020 16:23:56-0500, Nicolas Pitre wrote:
> On Wed, 30 Dec 2020, Arnd Bergmann wrote:
>
> > From: Arnd Bergmann <[email protected]>
> >
> > clang warns because the added __maybe_unused attribute is in
> > the wrong place:
> >
> > drivers/i3c/master/mipi-i3c-hci/core.c:780:21: error: attribute declaration must precede definition [-Werror,-Wignored-attributes]
> > static const struct __maybe_unused of_device_id i3c_hci_of_match[] = {
> > ^
> > include/linux/compiler_attributes.h:267:56: note: expanded
> >
> > Fixes: 95393f3e07ab ("i3c/master/mipi-i3c-hci: quiet maybe-unused variable warning")
> > Signed-off-by: Arnd Bergmann <[email protected]>
>
> Acked-by: Nicolas Pitre <[email protected]>
>
> This might be the 3rd patch from 3 different people fixing the same
> thing. Looks like I3C maintainer is on vacation. Please feel free to
> send this trivial fix upstream some other way.
>

Isn't it already upstream?
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=95393f3e07ab53855b91881692a4a5b52dcdc03c

--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

2020-12-30 21:45:27

by Nathan Chancellor

[permalink] [raw]
Subject: Re: [PATCH] i3c/master/mipi-i3c-hci: re-fix __maybe_unused attribute

On Wed, Dec 30, 2020 at 10:40:53PM +0100, Alexandre Belloni wrote:
> On 30/12/2020 16:23:56-0500, Nicolas Pitre wrote:
> > On Wed, 30 Dec 2020, Arnd Bergmann wrote:
> >
> > > From: Arnd Bergmann <[email protected]>
> > >
> > > clang warns because the added __maybe_unused attribute is in
> > > the wrong place:
> > >
> > > drivers/i3c/master/mipi-i3c-hci/core.c:780:21: error: attribute declaration must precede definition [-Werror,-Wignored-attributes]
> > > static const struct __maybe_unused of_device_id i3c_hci_of_match[] = {
> > > ^
> > > include/linux/compiler_attributes.h:267:56: note: expanded
> > >
> > > Fixes: 95393f3e07ab ("i3c/master/mipi-i3c-hci: quiet maybe-unused variable warning")
> > > Signed-off-by: Arnd Bergmann <[email protected]>
> >
> > Acked-by: Nicolas Pitre <[email protected]>
> >
> > This might be the 3rd patch from 3 different people fixing the same
> > thing. Looks like I3C maintainer is on vacation. Please feel free to
> > send this trivial fix upstream some other way.
> >
>
> Isn't it already upstream?
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=95393f3e07ab53855b91881692a4a5b52dcdc03c

This patch is fixing that one, the attribute was added between the
struct type, causing a new warning for clang.

I sent a fix for this earlier too, I do not care which one goes in as
long as one does so:

Reviewed-by: Nathan Chancellor <[email protected]>

Cheers,
Nathan

2020-12-30 22:03:29

by Alexandre Belloni

[permalink] [raw]
Subject: Re: [PATCH] i3c/master/mipi-i3c-hci: re-fix __maybe_unused attribute

On 30/12/2020 14:43:21-0700, Nathan Chancellor wrote:
> On Wed, Dec 30, 2020 at 10:40:53PM +0100, Alexandre Belloni wrote:
> > On 30/12/2020 16:23:56-0500, Nicolas Pitre wrote:
> > > On Wed, 30 Dec 2020, Arnd Bergmann wrote:
> > >
> > > > From: Arnd Bergmann <[email protected]>
> > > >
> > > > clang warns because the added __maybe_unused attribute is in
> > > > the wrong place:
> > > >
> > > > drivers/i3c/master/mipi-i3c-hci/core.c:780:21: error: attribute declaration must precede definition [-Werror,-Wignored-attributes]
> > > > static const struct __maybe_unused of_device_id i3c_hci_of_match[] = {
> > > > ^
> > > > include/linux/compiler_attributes.h:267:56: note: expanded
> > > >
> > > > Fixes: 95393f3e07ab ("i3c/master/mipi-i3c-hci: quiet maybe-unused variable warning")
> > > > Signed-off-by: Arnd Bergmann <[email protected]>
> > >
> > > Acked-by: Nicolas Pitre <[email protected]>
> > >
> > > This might be the 3rd patch from 3 different people fixing the same
> > > thing. Looks like I3C maintainer is on vacation. Please feel free to
> > > send this trivial fix upstream some other way.
> > >
> >
> > Isn't it already upstream?
> > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=95393f3e07ab53855b91881692a4a5b52dcdc03c
>
> This patch is fixing that one, the attribute was added between the
> struct type, causing a new warning for clang.
>

Ah yes, even after reading that 3 times, I got it wrong.

> I sent a fix for this earlier too, I do not care which one goes in as
> long as one does so:
>
> Reviewed-by: Nathan Chancellor <[email protected]>
>

I was going to review and apply yours now that I have access to the i3c
repo. I must admit I didn't have a look at i3c patches until now and the
holiday season is not helping.

--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com