diff mbox

net: dsa: mv88e6xxx: Add missing static to stub functions

Message ID 20170529125612.110244-1-arnd@arndb.de
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Arnd Bergmann May 29, 2017, 12:56 p.m. UTC
'static' was not enough, the helpers must be 'static inline'

net/dsa/mv88e6xxx/global2.h:123:12: error: 'mv88e6xxx_g2_misc_4_bit_port' defined but not used [-Werror=unused-function]
net/dsa/mv88e6xxx/global2.h:117:12: error: 'mv88e6xxx_g2_pvt_write' defined but not used [-Werror=unused-function]

Fixes: c21fbe29f858 ("net: dsa: mv88e6xxx: Add missing static to stub functions")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/net/dsa/mv88e6xxx/global2.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Vivien Didelot May 29, 2017, 3:01 p.m. UTC | #1
Hi Arnd,

Arnd Bergmann <arnd@arndb.de> writes:

> 'static' was not enough, the helpers must be 'static inline'
>
> net/dsa/mv88e6xxx/global2.h:123:12: error: 'mv88e6xxx_g2_misc_4_bit_port' defined but not used [-Werror=unused-function]
> net/dsa/mv88e6xxx/global2.h:117:12: error: 'mv88e6xxx_g2_pvt_write' defined but not used [-Werror=unused-function]
>
> Fixes: c21fbe29f858 ("net: dsa: mv88e6xxx: Add missing static to stub functions")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>

Thanks,

        Vivien
Andrew Lunn May 29, 2017, 3:30 p.m. UTC | #2
On Mon, May 29, 2017 at 02:56:01PM +0200, Arnd Bergmann wrote:
> 'static' was not enough, the helpers must be 'static inline'
> 
> net/dsa/mv88e6xxx/global2.h:123:12: error: 'mv88e6xxx_g2_misc_4_bit_port' defined but not used [-Werror=unused-function]
> net/dsa/mv88e6xxx/global2.h:117:12: error: 'mv88e6xxx_g2_pvt_write' defined but not used [-Werror=unused-function]
> 
> Fixes: c21fbe29f858 ("net: dsa: mv88e6xxx: Add missing static to stub functions")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Hi Arnd

Dave merged my fix yesterday.

     Andrew
Arnd Bergmann May 29, 2017, 9:06 p.m. UTC | #3
On Mon, May 29, 2017 at 5:30 PM, Andrew Lunn <andrew@lunn.ch> wrote:
> On Mon, May 29, 2017 at 02:56:01PM +0200, Arnd Bergmann wrote:
>> 'static' was not enough, the helpers must be 'static inline'
>>
>> net/dsa/mv88e6xxx/global2.h:123:12: error: 'mv88e6xxx_g2_misc_4_bit_port' defined but not used [-Werror=unused-function]
>> net/dsa/mv88e6xxx/global2.h:117:12: error: 'mv88e6xxx_g2_pvt_write' defined but not used [-Werror=unused-function]
>>
>> Fixes: c21fbe29f858 ("net: dsa: mv88e6xxx: Add missing static to stub functions")
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> Hi Arnd
>
> Dave merged my fix yesterday.

Hi Andrew,

The only commit I see from you in the net/master branch is the partial fix
I referenced in the 'fixes' line (c21fbe29f858), from all I can tell, my fix is
still needed on top. Can you check again?

        Arnd
Andrew Lunn May 30, 2017, 4:50 p.m. UTC | #4
On Mon, May 29, 2017 at 11:06:51PM +0200, Arnd Bergmann wrote:
> On Mon, May 29, 2017 at 5:30 PM, Andrew Lunn <andrew@lunn.ch> wrote:
> > On Mon, May 29, 2017 at 02:56:01PM +0200, Arnd Bergmann wrote:
> >> 'static' was not enough, the helpers must be 'static inline'
> >>
> >> net/dsa/mv88e6xxx/global2.h:123:12: error: 'mv88e6xxx_g2_misc_4_bit_port' defined but not used [-Werror=unused-function]
> >> net/dsa/mv88e6xxx/global2.h:117:12: error: 'mv88e6xxx_g2_pvt_write' defined but not used [-Werror=unused-function]
> >>
> >> Fixes: c21fbe29f858 ("net: dsa: mv88e6xxx: Add missing static to stub functions")
> >> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> >
> > Hi Arnd
> >
> > Dave merged my fix yesterday.
> 
> Hi Andrew,
> 
> The only commit I see from you in the net/master branch is the partial fix
> I referenced in the 'fixes' line (c21fbe29f858), from all I can tell, my fix is
> still needed on top. Can you check again?

Hi Arnd

Yes, you are correct. Adding the static was enough to stop the 0-day
warnings, but they should also inline.

	  Andrew
David Miller May 30, 2017, 6:08 p.m. UTC | #5
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 29 May 2017 14:56:01 +0200

> 'static' was not enough, the helpers must be 'static inline'
> 
> net/dsa/mv88e6xxx/global2.h:123:12: error: 'mv88e6xxx_g2_misc_4_bit_port' defined but not used [-Werror=unused-function]
> net/dsa/mv88e6xxx/global2.h:117:12: error: 'mv88e6xxx_g2_pvt_write' defined but not used [-Werror=unused-function]
> 
> Fixes: c21fbe29f858 ("net: dsa: mv88e6xxx: Add missing static to stub functions")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Applied.
diff mbox

Patch

diff --git a/drivers/net/dsa/mv88e6xxx/global2.h b/drivers/net/dsa/mv88e6xxx/global2.h
index d8d3c5abb2a1..14c0be98e0a4 100644
--- a/drivers/net/dsa/mv88e6xxx/global2.h
+++ b/drivers/net/dsa/mv88e6xxx/global2.h
@@ -114,13 +114,13 @@  static inline int mv88e6xxx_g2_set_eeprom16(struct mv88e6xxx_chip *chip,
 	return -EOPNOTSUPP;
 }
 
-static int mv88e6xxx_g2_pvt_write(struct mv88e6xxx_chip *chip, int src_dev,
-				  int src_port, u16 data)
+static inline int mv88e6xxx_g2_pvt_write(struct mv88e6xxx_chip *chip,
+					 int src_dev, int src_port, u16 data)
 {
 	return -EOPNOTSUPP;
 }
 
-static int mv88e6xxx_g2_misc_4_bit_port(struct mv88e6xxx_chip *chip)
+static inline int mv88e6xxx_g2_misc_4_bit_port(struct mv88e6xxx_chip *chip)
 {
 	return -EOPNOTSUPP;
 }