| Message ID | 20180222114459.1272945-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 46182452cf5abe95782e100f0719b7497641d263 |
| Headers | show |
| Series | dsa: ptp; mark dummy helpers as 'inline' | expand |
On Thu, Feb 22, 2018 at 12:44:40PM +0100, Arnd Bergmann wrote: > Declaring a static function in a header leads to a warning every > time that header gets included without the function being used: > > In file included from drivers/net/dsa/mv88e6xxx/chip.c:42: > drivers/net/dsa/mv88e6xxx/ptp.h:92:13: error: 'mv88e6xxx_hwtstamp_work' defined but not used [-Werror=unused-function] > static long mv88e6xxx_hwtstamp_work(struct ptp_clock_info *ptp) > In file included from drivers/net/dsa/mv88e6xxx/chip.c:38: > drivers/net/dsa/mv88e6xxx/global2.h:355:12: error: 'mv88e6xxx_g2_wait' defined but not used [-Werror=unused-function] > static int mv88e6xxx_g2_wait(struct mv88e6xxx_chip *chip, int reg, u16 mask) > ^~~~~~~~~~~~~~~~~ > drivers/net/dsa/mv88e6xxx/global2.h:350:12: error: 'mv88e6xxx_g2_update' defined but not used [-Werror=unused-function] > static int mv88e6xxx_g2_update(struct mv88e6xxx_chip *chip, int reg, u16 update) > ^~~~~~~~~~~~~~~~~~~ > drivers/net/dsa/mv88e6xxx/global2.h:345:12: error: 'mv88e6xxx_g2_write' defined but not used [-Werror=unused-function] > static int mv88e6xxx_g2_write(struct mv88e6xxx_chip *chip, int reg, u16 val) > ^~~~~~~~~~~~~~~~~~ > drivers/net/dsa/mv88e6xxx/global2.h:340:12: error: 'mv88e6xxx_g2_read' defined but not used [-Werror=unused-function] > static int mv88e6xxx_g2_read(struct mv88e6xxx_chip *chip, int reg, u16 *val) > > This marks all such functions in dsa inline to make sure we don't warn > about them. > > Fixes: c6fe0ad2c349 ("net: dsa: mv88e6xxx: add rx/tx timestamping support") > Fixes: 0d632c3d6fe3 ("net: dsa: mv88e6xxx: add accessors for PTP/TAI registers") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
On Thu, Feb 22, 2018 at 12:44:40PM +0100, Arnd Bergmann wrote: > Declaring a static function in a header leads to a warning every > time that header gets included without the function being used: Acked-by: Richard Cochran <richardcochran@gmail.com>
From: Arnd Bergmann <arnd@arndb.de> Date: Thu, 22 Feb 2018 12:44:40 +0100 > Declaring a static function in a header leads to a warning every > time that header gets included without the function being used: > > In file included from drivers/net/dsa/mv88e6xxx/chip.c:42: > drivers/net/dsa/mv88e6xxx/ptp.h:92:13: error: 'mv88e6xxx_hwtstamp_work' defined but not used [-Werror=unused-function] > static long mv88e6xxx_hwtstamp_work(struct ptp_clock_info *ptp) > In file included from drivers/net/dsa/mv88e6xxx/chip.c:38: > drivers/net/dsa/mv88e6xxx/global2.h:355:12: error: 'mv88e6xxx_g2_wait' defined but not used [-Werror=unused-function] > static int mv88e6xxx_g2_wait(struct mv88e6xxx_chip *chip, int reg, u16 mask) > ^~~~~~~~~~~~~~~~~ > drivers/net/dsa/mv88e6xxx/global2.h:350:12: error: 'mv88e6xxx_g2_update' defined but not used [-Werror=unused-function] > static int mv88e6xxx_g2_update(struct mv88e6xxx_chip *chip, int reg, u16 update) > ^~~~~~~~~~~~~~~~~~~ > drivers/net/dsa/mv88e6xxx/global2.h:345:12: error: 'mv88e6xxx_g2_write' defined but not used [-Werror=unused-function] > static int mv88e6xxx_g2_write(struct mv88e6xxx_chip *chip, int reg, u16 val) > ^~~~~~~~~~~~~~~~~~ > drivers/net/dsa/mv88e6xxx/global2.h:340:12: error: 'mv88e6xxx_g2_read' defined but not used [-Werror=unused-function] > static int mv88e6xxx_g2_read(struct mv88e6xxx_chip *chip, int reg, u16 *val) > > This marks all such functions in dsa inline to make sure we don't warn > about them. > > Fixes: c6fe0ad2c349 ("net: dsa: mv88e6xxx: add rx/tx timestamping support") > Fixes: 0d632c3d6fe3 ("net: dsa: mv88e6xxx: add accessors for PTP/TAI registers") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Applied, thanks Arnd.
diff --git a/drivers/net/dsa/mv88e6xxx/global2.h b/drivers/net/dsa/mv88e6xxx/global2.h index 25f92b3d7157..2a7c4f9b070c 100644 --- a/drivers/net/dsa/mv88e6xxx/global2.h +++ b/drivers/net/dsa/mv88e6xxx/global2.h @@ -337,22 +337,22 @@ static inline int mv88e6xxx_g2_require(struct mv88e6xxx_chip *chip) return 0; } -static int mv88e6xxx_g2_read(struct mv88e6xxx_chip *chip, int reg, u16 *val) +static inline int mv88e6xxx_g2_read(struct mv88e6xxx_chip *chip, int reg, u16 *val) { return -EOPNOTSUPP; } -static int mv88e6xxx_g2_write(struct mv88e6xxx_chip *chip, int reg, u16 val) +static inline int mv88e6xxx_g2_write(struct mv88e6xxx_chip *chip, int reg, u16 val) { return -EOPNOTSUPP; } -static int mv88e6xxx_g2_update(struct mv88e6xxx_chip *chip, int reg, u16 update) +static inline int mv88e6xxx_g2_update(struct mv88e6xxx_chip *chip, int reg, u16 update) { return -EOPNOTSUPP; } -static int mv88e6xxx_g2_wait(struct mv88e6xxx_chip *chip, int reg, u16 mask) +static inline int mv88e6xxx_g2_wait(struct mv88e6xxx_chip *chip, int reg, u16 mask) { return -EOPNOTSUPP; } diff --git a/drivers/net/dsa/mv88e6xxx/ptp.h b/drivers/net/dsa/mv88e6xxx/ptp.h index 992818ade746..10f271ab650d 100644 --- a/drivers/net/dsa/mv88e6xxx/ptp.h +++ b/drivers/net/dsa/mv88e6xxx/ptp.h @@ -89,7 +89,7 @@ void mv88e6xxx_ptp_free(struct mv88e6xxx_chip *chip); #else /* !CONFIG_NET_DSA_MV88E6XXX_PTP */ -static long mv88e6xxx_hwtstamp_work(struct ptp_clock_info *ptp) +static inline long mv88e6xxx_hwtstamp_work(struct ptp_clock_info *ptp) { return -1; } @@ -99,7 +99,7 @@ static inline int mv88e6xxx_ptp_setup(struct mv88e6xxx_chip *chip) return 0; } -static void mv88e6xxx_ptp_free(struct mv88e6xxx_chip *chip) +static inline void mv88e6xxx_ptp_free(struct mv88e6xxx_chip *chip) { }
Declaring a static function in a header leads to a warning every time that header gets included without the function being used: In file included from drivers/net/dsa/mv88e6xxx/chip.c:42: drivers/net/dsa/mv88e6xxx/ptp.h:92:13: error: 'mv88e6xxx_hwtstamp_work' defined but not used [-Werror=unused-function] static long mv88e6xxx_hwtstamp_work(struct ptp_clock_info *ptp) In file included from drivers/net/dsa/mv88e6xxx/chip.c:38: drivers/net/dsa/mv88e6xxx/global2.h:355:12: error: 'mv88e6xxx_g2_wait' defined but not used [-Werror=unused-function] static int mv88e6xxx_g2_wait(struct mv88e6xxx_chip *chip, int reg, u16 mask) ^~~~~~~~~~~~~~~~~ drivers/net/dsa/mv88e6xxx/global2.h:350:12: error: 'mv88e6xxx_g2_update' defined but not used [-Werror=unused-function] static int mv88e6xxx_g2_update(struct mv88e6xxx_chip *chip, int reg, u16 update) ^~~~~~~~~~~~~~~~~~~ drivers/net/dsa/mv88e6xxx/global2.h:345:12: error: 'mv88e6xxx_g2_write' defined but not used [-Werror=unused-function] static int mv88e6xxx_g2_write(struct mv88e6xxx_chip *chip, int reg, u16 val) ^~~~~~~~~~~~~~~~~~ drivers/net/dsa/mv88e6xxx/global2.h:340:12: error: 'mv88e6xxx_g2_read' defined but not used [-Werror=unused-function] static int mv88e6xxx_g2_read(struct mv88e6xxx_chip *chip, int reg, u16 *val) This marks all such functions in dsa inline to make sure we don't warn about them. Fixes: c6fe0ad2c349 ("net: dsa: mv88e6xxx: add rx/tx timestamping support") Fixes: 0d632c3d6fe3 ("net: dsa: mv88e6xxx: add accessors for PTP/TAI registers") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/net/dsa/mv88e6xxx/global2.h | 8 ++++---- drivers/net/dsa/mv88e6xxx/ptp.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) -- 2.9.0