Message ID | 20211026195711.16152-1-arnd@kernel.org (mailing list archive) |
---|---|
State | Not Applicable |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net-next] net: ax88796c: fix -Wpointer-bool-conversion warning | expand |
Context | Check | Description |
---|---|---|
netdev/apply | fail | Patch does not apply to net-next |
netdev/tree_selection | success | Clearly marked for net-next |
On Tue, 26 Oct 2021 21:56:39 +0200 Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > ax_local->phydev->advertising is an array, not a pointer, so > clang points out that checking for NULL is unnecessary: > > drivers/net/ethernet/asix/ax88796c_main.c:851:24: error: address of array 'ax_local->phydev->advertising' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion] > if (ax_local->phydev->advertising && > ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~ ~~ > > Fixes: a97c69ba4f30 ("net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/net/ethernet/asix/ax88796c_main.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/ethernet/asix/ax88796c_main.c b/drivers/net/ethernet/asix/ax88796c_main.c > index cfc597f72e3d..846a04922561 100644 > --- a/drivers/net/ethernet/asix/ax88796c_main.c > +++ b/drivers/net/ethernet/asix/ax88796c_main.c > @@ -848,11 +848,10 @@ ax88796c_open(struct net_device *ndev) > /* Setup flow-control configuration */ > phy_support_asym_pause(ax_local->phydev); > > - if (ax_local->phydev->advertising && > - (linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT, > - ax_local->phydev->advertising) || > - linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, > - ax_local->phydev->advertising))) > + if (linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT, > + ax_local->phydev->advertising) || > + linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, > + ax_local->phydev->advertising)) > fc |= AX_FC_ANEG; > > fc |= linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT, Same as 971f5c4079ed46a131ad3ac6e684ed056a7777da in net-next, thanks.
diff --git a/drivers/net/ethernet/asix/ax88796c_main.c b/drivers/net/ethernet/asix/ax88796c_main.c index cfc597f72e3d..846a04922561 100644 --- a/drivers/net/ethernet/asix/ax88796c_main.c +++ b/drivers/net/ethernet/asix/ax88796c_main.c @@ -848,11 +848,10 @@ ax88796c_open(struct net_device *ndev) /* Setup flow-control configuration */ phy_support_asym_pause(ax_local->phydev); - if (ax_local->phydev->advertising && - (linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT, - ax_local->phydev->advertising) || - linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, - ax_local->phydev->advertising))) + if (linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT, + ax_local->phydev->advertising) || + linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, + ax_local->phydev->advertising)) fc |= AX_FC_ANEG; fc |= linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT,