2010-08-19 14:13:46

by Johannes Berg

[permalink] [raw]
Subject: [PATCH] kernel-doc: be case insensitive when removing attributes

From: Johannes Berg <[email protected]>

There are valid attributes that could have upper
case letters, but we still want to remove, like
for example
__attribute__((aligned(NETDEV_ALIGN)))
as encountered in the wireless code.

Signed-off-by: Johannes Berg <[email protected]>
---
I thought we did this before? Bit confused now :)

scripts/kernel-doc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- wireless-testing.orig/scripts/kernel-doc 2010-08-19 16:11:40.000000000 +0200
+++ wireless-testing/scripts/kernel-doc 2010-08-19 16:11:45.000000000 +0200
@@ -1679,7 +1679,7 @@ sub check_sections($$$$$$) {
foreach $px (0 .. $#prms) {
$prm_clean = $prms[$px];
$prm_clean =~ s/\[.*\]//;
- $prm_clean =~ s/__attribute__\s*\(\([a-z,_\*\s\(\)]*\)\)//;
+ $prm_clean =~ s/__attribute__\s*\(\([a-z,_\*\s\(\)]*\)\)//i;
# ignore array size in a parameter string;
# however, the original param string may contain
# spaces, e.g.: addr[6 + 2]


2010-08-19 15:57:22

by Randy Dunlap

[permalink] [raw]
Subject: Re: [PATCH] kernel-doc: be case insensitive when removing attributes

On Thu, 19 Aug 2010 16:13:42 +0200 Johannes Berg wrote:

> From: Johannes Berg <[email protected]>
>
> There are valid attributes that could have upper
> case letters, but we still want to remove, like
> for example
> __attribute__((aligned(NETDEV_ALIGN)))
> as encountered in the wireless code.
>
> Signed-off-by: Johannes Berg <[email protected]>
> ---
> I thought we did this before? Bit confused now :)

I have a similar patch, without patch description & signoff,
so maybe it was from irc. Oh, and it's in a different script location.

@@ -1426,6 +1426,7 @@ sub dump_struct($$) {
$members =~ s/kmemcheck_bitfield_.*?;//gos;
# strip attributes
$members =~ s/__aligned\s*\(\d+\)//gos;
+ $members =~ s/__attribute__\s*\(\([a-zA-Z,_()\s\*]*\)\)//gos;


If yours (below) does what is needed, that's fine with me.

> scripts/kernel-doc | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- wireless-testing.orig/scripts/kernel-doc 2010-08-19 16:11:40.000000000 +0200
> +++ wireless-testing/scripts/kernel-doc 2010-08-19 16:11:45.000000000 +0200
> @@ -1679,7 +1679,7 @@ sub check_sections($$$$$$) {
> foreach $px (0 .. $#prms) {
> $prm_clean = $prms[$px];
> $prm_clean =~ s/\[.*\]//;
> - $prm_clean =~ s/__attribute__\s*\(\([a-z,_\*\s\(\)]*\)\)//;
> + $prm_clean =~ s/__attribute__\s*\(\([a-z,_\*\s\(\)]*\)\)//i;
> # ignore array size in a parameter string;
> # however, the original param string may contain
> # spaces, e.g.: addr[6 + 2]
>
>
> --


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

2010-08-19 16:21:19

by Johannes Berg

[permalink] [raw]
Subject: Re: [PATCH] kernel-doc: be case insensitive when removing attributes

On Thu, 2010-08-19 at 08:57 -0700, Randy Dunlap wrote:
> On Thu, 19 Aug 2010 16:13:42 +0200 Johannes Berg wrote:
>
> > From: Johannes Berg <[email protected]>
> >
> > There are valid attributes that could have upper
> > case letters, but we still want to remove, like
> > for example
> > __attribute__((aligned(NETDEV_ALIGN)))
> > as encountered in the wireless code.
> >
> > Signed-off-by: Johannes Berg <[email protected]>
> > ---
> > I thought we did this before? Bit confused now :)
>
> I have a similar patch, without patch description & signoff,
> so maybe it was from irc. Oh, and it's in a different script location.

Oh, ok.

> @@ -1426,6 +1426,7 @@ sub dump_struct($$) {
> $members =~ s/kmemcheck_bitfield_.*?;//gos;
> # strip attributes
> $members =~ s/__aligned\s*\(\d+\)//gos;
> + $members =~ s/__attribute__\s*\(\([a-zA-Z,_()\s\*]*\)\)//gos;
>
>
> If yours (below) does what is needed, that's fine with me.

Yes, it removes the warning for me.

johannes