cxgb4: fix boolreturn.cocci warnings
Subsystems (7)
A message that is not in the archive (sent off-list or not yet received): 201503260524.AdqSbov9%[email protected]
kbuild test robot
build botdrivers/net/ethernet/chelsio/cxgb4/cxgb4_fcoe.c:49:9-10: WARNING: return of 0/1 in function 'cxgb_fcoe_sof_eof_supported' with return type bool
Return statements in functions returning bool should use true/false instead of 1/0.
Generated by: scripts/coccinelle/misc/boolreturn.cocci
---
cxgb4_fcoe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/chelsio/cxgb4/cxgb4_fcoe.c +3 -3
@@ -46,17 +46,17 @@ bool cxgb_fcoe_sof_eof_supported(structif ((sof !=FC_SOF_I3 ) && (sof !=FC_SOF_N3 )) {dev_err (adap->pdev_dev,"Unsupported SOF 0x%x\n" , sof); -return 0 ; +return false; }skb_copy_bits (skb, skb->len -4 , &eof,1 );if ((eof !=FC_EOF_N ) && (eof !=FC_EOF_T )) {dev_err (adap->pdev_dev,"Unsupported EOF 0x%x\n" , eof); -return 0 ; +return false; } -return 1 ; +return true; }/**
Quoted 1 line · kbuild test robot
drivers/net/ethernet/chelsio/cxgb4/cxgb4_fcoe.c:49:9-10: WARNING: return of 0/1 in function '
cxgb_fcoe_sof_eof_supported' with return type bool
Hey Fengguang.
There are so many of these that could be fixed.
Did you establish a queue to ration them out slowly or do you just do them every once in awhile?
cheers, Joe
From: kbuild test robot <[email protected]>
Date: Thu, 26 Mar 2015 05:55:25 +0800
Quoted 8 lines
drivers/net/ethernet/chelsio/cxgb4/cxgb4_fcoe.c:49:9-10: WARNING: return of 0/1 in function '
cxgb_fcoe_sof_eof_supported' with return type boolReturn statements in functions returning bool should use true/false instead of 1/0.
Generated by:scripts/coccinelle/misc/boolreturn.cocciCC Varun Prakash <[email protected]>Signed-off-by Fengguang Wu <[email protected]>
Applied.
To be honest I'd might rather get bunches of these, there has to be a ton of them, than a slow trickle of one every few weeks/days.
PATCH 1/1 ethernet: Use bool function returns of true/false instead of 1/0
Use bool constants as the return values instead of 1 and 0.
---
Quoted 2 lines
To be honest I'd might rather get bunches of these, there has to be a ton of them, than a slow trickle of one every few weeks/days.
There aren't too many...
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 4 ++-- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +1 -1
@@ -11610,7 +11610,7 @@ static bool bnx2x_get_dropless_info(struct bnx2x *bp)u32 cfg;if (IS_VF (bp)) -return 0 ; +return false;if (IS_MF (bp) && !CHIP_IS_E1x (bp)) {/* Take function: tmp = func */
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +2 -2
@@ -1351,7 +1351,7 @@ static bool reg_pattern_test(struct ixgbe_adapter *adapter, u64 *data, int reg,if (ixgbe_removed (adapter->hw.hw_addr)) { *data =1 ; -return 1 ; +return true; }for (pat =0 ; pat <ARRAY_SIZE (test_pattern); pat++) { before =ixgbe_read_reg (&adapter->hw, reg);
@@ -1376,7 +1376,7 @@ static bool reg_set_and_check(struct ixgbe_adapter *adapter, u64 *data, int reg,if (ixgbe_removed (adapter->hw.hw_addr)) { *data =1 ; -return 1 ; +return true; } before =ixgbe_read_reg (&adapter->hw, reg);ixgbe_write_reg (&adapter->hw, reg, write & mask);
drivers/net/ethernet/xilinx/xilinx_emaclite.c +1 -1
@@ -1062,7 +1062,7 @@ static bool get_bool(struct platform_device *ofdev, const char *s) }else {dev_warn (&ofdev->dev,"Parameter %s not found," "defaulting to false\n" , s); -return 0 ; +return false; } }
PATCH 1/1 wireless: Use bool function returns of true/false instead of 1/0
Use bool constants as the return values instead of 1 and 0.
---
Quoted 2 lines
To be honest I'd might rather get bunches of these, there has to be a ton of them, than a slow trickle of one every few weeks/days.
There aren't too many here either...
drivers/net/wireless/b43/dma.c | 12 ++++++------ drivers/net/wireless/b43legacy/dma.c | 6 +++--- drivers/net/wireless/b43legacy/rfkill.c | 8 ++++---- drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c | 2 +- drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c | 2 +- drivers/net/wireless/iwlwifi/iwl-config.h | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-)
drivers/net/wireless/b43/dma.c +6 -6
@@ -553,7 +553,7 @@ static bool b43_dma_mapping_error(struct b43_dmaring *ring, size_t buffersize, bool dma_to_device) { if (unlikely(dma_mapping_error(ring->dev->dev->dma_dev, addr))) - return 1; + return true;switch (ring->type) {case B43_DMA_30BIT :
@@ -571,13 +571,13 @@ static bool b43_dma_mapping_error(struct b43_dmaring *ring, }/* The address is OK. */ -return 0 ; +return false; address_error:/* We can't support this address. Unmap it again. */ unmap_descbuffer (ring, addr, buffersize, dma_to_device); -return 1 ; +return true; }static bool b43_rx_buffer_is_poisoned (struct b43_dmaring *ring,struct sk_buff *skb)
@@ -1099,16 +1099,16 @@ static bool b43_dma_translation_in_low_word(struct b43_wldev *dev, enum b43_dmatype type) {if (type !=B43_DMA_64BIT ) -return 1 ; +return true;#ifdef CONFIG_B43_SSB if (dev->dev->bus_type ==B43_BUS_SSB && dev->dev->sdev->bus->bustype ==SSB_BUSTYPE_PCI && !(pci_is_pcie (dev->dev->sdev->bus->host_pci) &&ssb_read32 (dev->dev->sdev,SSB_TMSHIGH ) &SSB_TMSHIGH_DMA64 )) -return 1 ; +return true;#endif -return 0 ; +return false; }int b43_dma_init (struct b43_wldev *dev)
drivers/net/wireless/b43legacy/dma.c +3 -3
@@ -427,7 +427,7 @@ static bool b43legacy_dma_mapping_error(struct b43legacy_dmaring *ring, bool dma_to_device) {if (unlikely (dma_mapping_error (ring->dev->dev->dma_dev, addr))) -return 1 ; +return true;switch (ring->type) {case B43legacy_DMA_30BIT:
@@ -441,13 +441,13 @@ static bool b43legacy_dma_mapping_error(struct b43legacy_dmaring *ring, }/* The address is OK. */ -return 0 ; +return false; address_error:/* We can't support this address. Unmap it again. */ unmap_descbuffer (ring, addr, buffersize, dma_to_device); -return 1 ; +return true; } static int setup_rx_descbuffer(struct b43legacy_dmaring *ring,
drivers/net/wireless/b43legacy/rfkill.c +4 -4
@@ -32,7 +32,7 @@ bool b43legacy_is_hw_radio_enabled(struct b43legacy_wldev *dev)if (dev->dev->id.revision >=3 ) {if (!(b43legacy_read32 (dev, B43legacy_MMIO_RADIO_HWENABLED_HI) & B43legacy_MMIO_RADIO_HWENABLED_HI_MASK)) -return 1 ; +return true; }else {/* To prevent CPU fault on PPC, do not read a register * unless the interface is started; however, on resume
@@ -40,12 +40,12 @@ bool b43legacy_is_hw_radio_enabled(struct b43legacy_wldev *dev)* that happens, unconditionally return TRUE. */ if (b43legacy_status (dev) < B43legacy_STAT_STARTED) -return 1 ; +return true;if (b43legacy_read16 (dev, B43legacy_MMIO_RADIO_HWENABLED_LO) & B43legacy_MMIO_RADIO_HWENABLED_LO_MASK) -return 1 ; +return true; } -return 0 ; +return false; }/* The poll callback for the hardware button. */
drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c +1 -1
@@ -2949,5 +2949,5 @@ bool wlc_phy_txpower_ipa_ison(struct brcms_phy_pub *ppi)if (ISNPHY (pi))return wlc_phy_n_txpower_ipa_ison (pi);else -return 0 ; +return false; }
drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c +1 -1
@@ -4999,7 +4999,7 @@ void wlc_2064_vco_cal(struct brcms_phy *pi)bool wlc_phy_tpc_isenabled_lcnphy (struct brcms_phy *pi) {if (wlc_lcnphy_tempsense_based_pwr_ctrl_enabled (pi)) -return 0 ; +return false;else return (LCNPHY_TX_PWR_CTRL_HW ==wlc_lcnphy_get_tx_pwr_ctrl ((pi)));
drivers/net/wireless/iwlwifi/iwl-config.h +2 -2
@@ -92,9 +92,9 @@ static inline bool iwl_has_secure_boot(u32 hw_rev, {/* return 1 only for family 8000 B0 */ if ((family ==IWL_DEVICE_FAMILY_8000 ) && (hw_rev &0xC )) -return 1 ; +return true; -return 0 ; +return false; }/*
Re: [PATCH net-next] wireless: Use bool function returns of true/false instead of 1/0
Quoted 9 lines · Joe Perches
Use bool constants as the return values instead of 1 and 0.
Signed-off-by Joe Perches <[email protected]>---
Quoted 2 lines
To be honest I'd might rather get bunches of these, there has to be a ton of them, than a slow trickle of one every few weeks/days.
There aren't too many here either...
Quoted 7 lines
drivers/net/wireless/b43/dma.c | 12 ++++++------ drivers/net/wireless/b43legacy/dma.c | 6 +++--- drivers/net/wireless/b43legacy/rfkill.c | 8 ++++---- drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c | 2 +- drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c | 2 +- drivers/net/wireless/iwlwifi/iwl-config.h | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-)
Please split these into separate patches for each driver. That way it will be possible to search 'git log' for the contributions to each driver. Otherwise, the patches are OK.
Thanks,
Larry
Quoted 151 lines
drivers/net/wireless/b43/dma.c +6
-6@@ -553,7 +553,7 @@ static bool b43_dma_mapping_error(struct b43_dmaring *ring, size_t buffersize, bool dma_to_device) { if (unlikely(dma_mapping_error(ring->dev->dev->dma_dev, addr))) - return 1; + return true;switch (ring->type) {case B43_DMA_30BIT :@@ -571,13 +571,13 @@ static bool b43_dma_mapping_error(struct b43_dmaring *ring, }/* The address is OK. */ -return 0 ; +return false; address_error:/* We can't support this address. Unmap it again. */ unmap_descbuffer (ring, addr, buffersize, dma_to_device); -return 1 ; +return true; }static bool b43_rx_buffer_is_poisoned (struct b43_dmaring *ring,struct sk_buff *skb)@@ -1099,16 +1099,16 @@ static bool b43_dma_translation_in_low_word(struct b43_wldev *dev, enum b43_dmatype type) {if (type !=B43_DMA_64BIT ) -return 1 ; +return true;#ifdef CONFIG_B43_SSB if (dev->dev->bus_type ==B43_BUS_SSB && dev->dev->sdev->bus->bustype ==SSB_BUSTYPE_PCI && !(pci_is_pcie (dev->dev->sdev->bus->host_pci) &&ssb_read32 (dev->dev->sdev,SSB_TMSHIGH ) &SSB_TMSHIGH_DMA64 )) -return 1 ; +return true;#endif -return 0 ; +return false; }int b43_dma_init (struct b43_wldev *dev)drivers/net/wireless/b43legacy/dma.c +3
-3@@ -427,7 +427,7 @@ static bool b43legacy_dma_mapping_error(struct b43legacy_dmaring *ring, bool dma_to_device) {if (unlikely (dma_mapping_error (ring->dev->dev->dma_dev, addr))) -return 1 ; +return true;switch (ring->type) {case B43legacy_DMA_30BIT:@@ -441,13 +441,13 @@ static bool b43legacy_dma_mapping_error(struct b43legacy_dmaring *ring, }/* The address is OK. */ -return 0 ; +return false; address_error:/* We can't support this address. Unmap it again. */ unmap_descbuffer (ring, addr, buffersize, dma_to_device); -return 1 ; +return true; } static int setup_rx_descbuffer(struct b43legacy_dmaring *ring,drivers/net/wireless/b43legacy/rfkill.c +4
-4@@ -32,7 +32,7 @@ bool b43legacy_is_hw_radio_enabled(struct b43legacy_wldev *dev)if (dev->dev->id.revision >=3 ) {if (!(b43legacy_read32 (dev, B43legacy_MMIO_RADIO_HWENABLED_HI) & B43legacy_MMIO_RADIO_HWENABLED_HI_MASK)) -return 1 ; +return true; }else {/* To prevent CPU fault on PPC, do not read a register * unless the interface is started; however, on resume @@ -40,12 +40,12 @@ bool b43legacy_is_hw_radio_enabled(struct b43legacy_wldev *dev)* that happens, unconditionally return TRUE. */ if (b43legacy_status (dev) < B43legacy_STAT_STARTED) -return 1 ; +return true;if (b43legacy_read16 (dev, B43legacy_MMIO_RADIO_HWENABLED_LO) & B43legacy_MMIO_RADIO_HWENABLED_LO_MASK) -return 1 ; +return true; } -return 0 ; +return false; }/* The poll callback for the hardware button. */ drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c +1
-1@@ -2949,5 +2949,5 @@ bool wlc_phy_txpower_ipa_ison(struct brcms_phy_pub *ppi)if (ISNPHY (pi))return wlc_phy_n_txpower_ipa_ison (pi);else -return 0 ; +return false; }drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c +1
-1@@ -4999,7 +4999,7 @@ void wlc_2064_vco_cal(struct brcms_phy *pi)bool wlc_phy_tpc_isenabled_lcnphy (struct brcms_phy *pi) {if (wlc_lcnphy_tempsense_based_pwr_ctrl_enabled (pi)) -return 0 ; +return false;else return (LCNPHY_TX_PWR_CTRL_HW ==wlc_lcnphy_get_tx_pwr_ctrl ((pi)));drivers/net/wireless/iwlwifi/iwl-config.h +2
-2@@ -92,9 +92,9 @@ static inline bool iwl_has_secure_boot(u32 hw_rev, {/* return 1 only for family 8000 B0 */ if ((family ==IWL_DEVICE_FAMILY_8000 ) && (hw_rev &0xC )) -return 1 ; +return true; -return 0 ; +return false; }/*
Re: [PATCH net-next] wireless: Use bool function returns of true/false instead of 1/0
Quoted 18 lines · Larry Finger
Quoted 9 lines · Joe Perches
Use bool constants as the return values instead of 1 and 0.
Signed-off-by Joe Perches <[email protected]>---
Quoted 2 lines
To be honest I'd might rather get bunches of these, there has to be a ton of them, than a slow trickle of one every few weeks/days.
There aren't too many here either...
Quoted 7 lines
drivers/net/wireless/b43/dma.c | 12 ++++++------ drivers/net/wireless/b43legacy/dma.c | 6 +++--- drivers/net/wireless/b43legacy/rfkill.c | 8 ++++---- drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c | 2 +- drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c | 2 +- drivers/net/wireless/iwlwifi/iwl-config.h | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-)
Quoted 3 lines
Please split these into separate patches for each driver. That way it will be possible to search 'git log' for the contributions to each driver. Otherwise, the patches are OK.
It's still possible.
git log <directory> shows the individual patches.
Kalle Valo
AppliedRe: [net-next] wireless: Use bool function returns of true/false insteadof 1/0
In reply to Joe PerchesQuoted 4 lines
Use bool constants as the return values instead of 1 and 0.
Signed-off-by Joe Perches <[email protected]>
Thanks, applied to wireless-drivers-next.git.
Kalle Valo
Re: [PATCH net-next] ethernet: Use bool function returns of true/false instead of 1/0
In reply to Joe PerchesQuoted 3 lines · Joe Perches
Use bool constants as the return values instead of 1 and 0.
Signed-off-by Joe Perches <[email protected]>
For the ixgbe changes...
Quoted 11 lines
---
Quoted 1 line
To be honest I'd might rather get bunches of these, there has to be
a ton
Quoted 1 line
of them, than a slow trickle of one every few weeks/days.
There aren't too many...
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 4 ++-- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150330/1e752dd6/attachment-0001.sig>
Re: [PATCH net-next] ethernet: Use bool function returns of true/false instead of 1/0
In reply to Joe PerchesQuoted 54 lines · Joe Perches
Use bool constants as the return values instead of 1 and 0.
Signed-off-by Joe Perches <[email protected]>---
Quoted 2 lines
To be honest I'd might rather get bunches of these, there has to be a ton of them, than a slow trickle of one every few weeks/days.
There aren't too many...
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 4 ++-- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +1
-1@@ -11610,7 +11610,7 @@ static bool bnx2x_get_dropless_info(struct bnx2x *bp)u32 cfg;if (IS_VF (bp)) -return 0 ; +return false;if (IS_MF (bp) && !CHIP_IS_E1x (bp)) {/* Take function: tmp = func */ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +2
-2@@ -1351,7 +1351,7 @@ static bool reg_pattern_test(struct ixgbe_adapter *adapter, u64 *data, int reg,if (ixgbe_removed (adapter->hw.hw_addr)) { *data =1 ; -return 1 ; +return true; }for (pat =0 ; pat <ARRAY_SIZE (test_pattern); pat++) { before =ixgbe_read_reg (&adapter->hw, reg);@@ -1376,7 +1376,7 @@ static bool reg_set_and_check(struct ixgbe_adapter *adapter, u64 *data, int reg,if (ixgbe_removed (adapter->hw.hw_addr)) { *data =1 ; -return 1 ; +return true; } before =ixgbe_read_reg (&adapter->hw, reg);ixgbe_write_reg (&adapter->hw, reg, write & mask);drivers/net/ethernet/xilinx/xilinx_emaclite.c +0
-0
drivers/net/ethernet/xilinx/xilinx_emaclite.c static bool get_bool(struct platform_device *ofdev, const char *s) · line 1067
Quoted 7 lines
drivers/net/ethernet/xilinx/xilinx_emaclite.c +1
-1@@ -1062,7 +1062,7 @@ static bool get_bool(struct platform_device *ofdev, const char *s) }else {dev_warn (&ofdev->dev,"Parameter %s not found," "defaulting to false\n" , s); -return 0 ; +return false; } }
Kernel-doc should be also fixed in spite of this whole function is just broken and binding should be fixed to use of_property_read_bool for these properties.
Thanks,
Michal
Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: OpenPGP digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150331/a20eff93/attachment-0001.sig>
Re: [PATCH net-next] ethernet: Use bool function returns of true/false instead of 1/0
(shortened cc list)
Quoted 2 lines · Michal Simek
Quoted 1 line · Joe Perches
Use bool constants as the return values instead of 1 and 0.
[]
Quoted 8 lines
Quoted 8 lines
drivers/net/ethernet/xilinx/xilinx_emaclite.c +0
-0@@ -1062,7 +1062,7 @@ static bool get_bool(struct platform_device *ofdev, const char *s) }else {dev_warn (&ofdev->dev,"Parameter %s not found," "defaulting to false\n" , s);
Quoted 8 lines
drivers/net/ethernet/xilinx/xilinx_emaclite.c static bool get_bool(struct platform_device *ofdev, const char *s) · line 1067
Quoted 4 lines
drivers/net/ethernet/xilinx/xilinx_emaclite.c +1
-1-return 0 ; +return false; } }Kernel-doc should be also fixed in spite of this whole function is just broken and binding should be fixed to use
of_property_read_boolfor these properties.
Hi Michal.
David's applied this so if you or Sören want to fix up the function and kernel-doc to your taste, please do.
cheers, Joe
Re: [PATCH net-next] ethernet: Use bool function returns of true/false instead of 1/0
In reply to Joe PerchesFrom: Joe Perches <[email protected]>
Date: Sun, 29 Mar 2015 18:25:12 -0700
Quoted 3 lines
Use bool constants as the return values instead of 1 and 0.
Signed-off-by Joe Perches <[email protected]>
Applied, thanks Joe.