2021-10-30 02:13:18

by Randy Dunlap

[permalink] [raw]
Subject: [PATCH] kernel-doc: support DECLARE_PHY_INTERFACE_MASK()

Support the DECLARE_PHY_INTERFACE_MASK() macro that is used to declare
a bitmap by converting the macro to DECLARE_BITMAP(), as has been done
for the __ETHTOOL_DECLARE_LINK_MODE_MASK() macro.

This fixes a 'make htmldocs' warning:

include/linux/phylink.h:82: warning: Function parameter or member 'DECLARE_PHY_INTERFACE_MASK(supported_interfaces' not described in 'phylink_config'

that was introduced by commit
38c310eb46f5 ("net: phylink: add MAC phy_interface_t bitmap")

Signed-off-by: Randy Dunlap <[email protected]>
Reported-by: Stephen Rothwell <[email protected]>
Cc: Russell King (Oracle) <[email protected]>
Cc: [email protected]
To: Jonathan Corbet <[email protected]>
---
scripts/kernel-doc | 1 +
1 file changed, 1 insertion(+)

--- linux-next-20211029.orig/scripts/kernel-doc
+++ linux-next-20211029/scripts/kernel-doc
@@ -1256,6 +1256,7 @@ sub dump_struct($$) {
my $args = qr{([^,)]+)};
# replace DECLARE_BITMAP
$members =~ s/__ETHTOOL_DECLARE_LINK_MODE_MASK\s*\(([^\)]+)\)/DECLARE_BITMAP($1, __ETHTOOL_LINK_MODE_MASK_NBITS)/gos;
+ $members =~ s/DECLARE_PHY_INTERFACE_MASK\s*\(([^\)]+)\)/DECLARE_BITMAP($1, PHY_INTERFACE_MODE_MAX)/gos;
$members =~ s/DECLARE_BITMAP\s*\($args,\s*$args\)/unsigned long $1\[BITS_TO_LONGS($2)\]/gos;
# replace DECLARE_HASHTABLE
$members =~ s/DECLARE_HASHTABLE\s*\($args,\s*$args\)/unsigned long $1\[1 << (($2) - 1)\]/gos;


2022-04-14 00:52:16

by Randy Dunlap

[permalink] [raw]
Subject: Re: [PATCH] kernel-doc: support DECLARE_PHY_INTERFACE_MASK()



On 4/13/22 04:09, Russell King (Oracle) wrote:
> On Fri, Oct 29, 2021 at 07:08:13PM -0700, Randy Dunlap wrote:
>> Support the DECLARE_PHY_INTERFACE_MASK() macro that is used to declare
>> a bitmap by converting the macro to DECLARE_BITMAP(), as has been done
>> for the __ETHTOOL_DECLARE_LINK_MODE_MASK() macro.
>>
>> This fixes a 'make htmldocs' warning:
>>
>> include/linux/phylink.h:82: warning: Function parameter or member 'DECLARE_PHY_INTERFACE_MASK(supported_interfaces' not described in 'phylink_config'
>>
>> that was introduced by commit
>> 38c310eb46f5 ("net: phylink: add MAC phy_interface_t bitmap")
>>
>> Signed-off-by: Randy Dunlap <[email protected]>
>> Reported-by: Stephen Rothwell <[email protected]>
>> Cc: Russell King (Oracle) <[email protected]>
>
> Thanks Randy, sorry I missed this patch.
>
> Reviewed-by: Russell King (Oracle) <[email protected]>
>
> What is the intention for merging this patch? Will Jon merge it?
> Your tags said To: Jon but you don't seem to have included him in
> the email.

Hm, I didn't notice that.
Guess I'll resend it with your R-b.

thanks.

--
~Randy

2022-04-14 06:14:40

by Russell King (Oracle)

[permalink] [raw]
Subject: Re: [PATCH] kernel-doc: support DECLARE_PHY_INTERFACE_MASK()

On Fri, Oct 29, 2021 at 07:08:13PM -0700, Randy Dunlap wrote:
> Support the DECLARE_PHY_INTERFACE_MASK() macro that is used to declare
> a bitmap by converting the macro to DECLARE_BITMAP(), as has been done
> for the __ETHTOOL_DECLARE_LINK_MODE_MASK() macro.
>
> This fixes a 'make htmldocs' warning:
>
> include/linux/phylink.h:82: warning: Function parameter or member 'DECLARE_PHY_INTERFACE_MASK(supported_interfaces' not described in 'phylink_config'
>
> that was introduced by commit
> 38c310eb46f5 ("net: phylink: add MAC phy_interface_t bitmap")
>
> Signed-off-by: Randy Dunlap <[email protected]>
> Reported-by: Stephen Rothwell <[email protected]>
> Cc: Russell King (Oracle) <[email protected]>

Thanks Randy, sorry I missed this patch.

Reviewed-by: Russell King (Oracle) <[email protected]>

What is the intention for merging this patch? Will Jon merge it?
Your tags said To: Jon but you don't seem to have included him in
the email.

--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!

2022-04-16 02:26:36

by Randy Dunlap

[permalink] [raw]
Subject: Re: [PATCH] kernel-doc: support DECLARE_PHY_INTERFACE_MASK()



On 4/13/22 08:19, Randy Dunlap wrote:
>
>
> On 4/13/22 04:09, Russell King (Oracle) wrote:
>> On Fri, Oct 29, 2021 at 07:08:13PM -0700, Randy Dunlap wrote:
>>> Support the DECLARE_PHY_INTERFACE_MASK() macro that is used to declare
>>> a bitmap by converting the macro to DECLARE_BITMAP(), as has been done
>>> for the __ETHTOOL_DECLARE_LINK_MODE_MASK() macro.
>>>
>>> This fixes a 'make htmldocs' warning:
>>>
>>> include/linux/phylink.h:82: warning: Function parameter or member 'DECLARE_PHY_INTERFACE_MASK(supported_interfaces' not described in 'phylink_config'
>>>
>>> that was introduced by commit
>>> 38c310eb46f5 ("net: phylink: add MAC phy_interface_t bitmap")
>>>
>>> Signed-off-by: Randy Dunlap <[email protected]>
>>> Reported-by: Stephen Rothwell <[email protected]>
>>> Cc: Russell King (Oracle) <[email protected]>
>>
>> Thanks Randy, sorry I missed this patch.
>>
>> Reviewed-by: Russell King (Oracle) <[email protected]>
>>
>> What is the intention for merging this patch? Will Jon merge it?
>> Your tags said To: Jon but you don't seem to have included him in
>> the email.
>
> Hm, I didn't notice that.
> Guess I'll resend it with your R-b.

No need to resend it. It's already merged into mainline.

--
~Randy