diff options
author | Joe Perches <joe@perches.com> | 2015-03-29 21:29:42 -0400 |
---|---|---|
committer | Kalle Valo <kvalo@codeaurora.org> | 2015-04-07 13:10:23 -0400 |
commit | 12827fecf4dd47cc6e2b3a37edcdf81b52c9e2fa (patch) | |
tree | a788a7b19a67992cac49b9ea113b5e0d14b8fb7a | |
parent | cad737dfde3566e3293e884e8b391e2cae7e8068 (diff) |
wireless: Use bool function returns of true/false instead of 1/0
Use bool constants as the return values instead of 1 and 0.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-rw-r--r-- | drivers/net/wireless/b43/dma.c | 12 | ||||
-rw-r--r-- | drivers/net/wireless/b43legacy/dma.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/b43legacy/rfkill.c | 8 | ||||
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-config.h | 4 |
6 files changed, 17 insertions, 17 deletions
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c index 1d7982afc0ad..6837064908be 100644 --- a/drivers/net/wireless/b43/dma.c +++ b/drivers/net/wireless/b43/dma.c | |||
@@ -553,7 +553,7 @@ static bool b43_dma_mapping_error(struct b43_dmaring *ring, | |||
553 | size_t buffersize, bool dma_to_device) | 553 | size_t buffersize, bool dma_to_device) |
554 | { | 554 | { |
555 | if (unlikely(dma_mapping_error(ring->dev->dev->dma_dev, addr))) | 555 | if (unlikely(dma_mapping_error(ring->dev->dev->dma_dev, addr))) |
556 | return 1; | 556 | return true; |
557 | 557 | ||
558 | switch (ring->type) { | 558 | switch (ring->type) { |
559 | case B43_DMA_30BIT: | 559 | case B43_DMA_30BIT: |
@@ -571,13 +571,13 @@ static bool b43_dma_mapping_error(struct b43_dmaring *ring, | |||
571 | } | 571 | } |
572 | 572 | ||
573 | /* The address is OK. */ | 573 | /* The address is OK. */ |
574 | return 0; | 574 | return false; |
575 | 575 | ||
576 | address_error: | 576 | address_error: |
577 | /* We can't support this address. Unmap it again. */ | 577 | /* We can't support this address. Unmap it again. */ |
578 | unmap_descbuffer(ring, addr, buffersize, dma_to_device); | 578 | unmap_descbuffer(ring, addr, buffersize, dma_to_device); |
579 | 579 | ||
580 | return 1; | 580 | return true; |
581 | } | 581 | } |
582 | 582 | ||
583 | static bool b43_rx_buffer_is_poisoned(struct b43_dmaring *ring, struct sk_buff *skb) | 583 | 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, | |||
1099 | enum b43_dmatype type) | 1099 | enum b43_dmatype type) |
1100 | { | 1100 | { |
1101 | if (type != B43_DMA_64BIT) | 1101 | if (type != B43_DMA_64BIT) |
1102 | return 1; | 1102 | return true; |
1103 | 1103 | ||
1104 | #ifdef CONFIG_B43_SSB | 1104 | #ifdef CONFIG_B43_SSB |
1105 | if (dev->dev->bus_type == B43_BUS_SSB && | 1105 | if (dev->dev->bus_type == B43_BUS_SSB && |
1106 | dev->dev->sdev->bus->bustype == SSB_BUSTYPE_PCI && | 1106 | dev->dev->sdev->bus->bustype == SSB_BUSTYPE_PCI && |
1107 | !(pci_is_pcie(dev->dev->sdev->bus->host_pci) && | 1107 | !(pci_is_pcie(dev->dev->sdev->bus->host_pci) && |
1108 | ssb_read32(dev->dev->sdev, SSB_TMSHIGH) & SSB_TMSHIGH_DMA64)) | 1108 | ssb_read32(dev->dev->sdev, SSB_TMSHIGH) & SSB_TMSHIGH_DMA64)) |
1109 | return 1; | 1109 | return true; |
1110 | #endif | 1110 | #endif |
1111 | return 0; | 1111 | return false; |
1112 | } | 1112 | } |
1113 | 1113 | ||
1114 | int b43_dma_init(struct b43_wldev *dev) | 1114 | int b43_dma_init(struct b43_wldev *dev) |
diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c index b2ed1795130b..f9dd892b9f27 100644 --- a/drivers/net/wireless/b43legacy/dma.c +++ b/drivers/net/wireless/b43legacy/dma.c | |||
@@ -427,7 +427,7 @@ static bool b43legacy_dma_mapping_error(struct b43legacy_dmaring *ring, | |||
427 | bool dma_to_device) | 427 | bool dma_to_device) |
428 | { | 428 | { |
429 | if (unlikely(dma_mapping_error(ring->dev->dev->dma_dev, addr))) | 429 | if (unlikely(dma_mapping_error(ring->dev->dev->dma_dev, addr))) |
430 | return 1; | 430 | return true; |
431 | 431 | ||
432 | switch (ring->type) { | 432 | switch (ring->type) { |
433 | case B43legacy_DMA_30BIT: | 433 | case B43legacy_DMA_30BIT: |
@@ -441,13 +441,13 @@ static bool b43legacy_dma_mapping_error(struct b43legacy_dmaring *ring, | |||
441 | } | 441 | } |
442 | 442 | ||
443 | /* The address is OK. */ | 443 | /* The address is OK. */ |
444 | return 0; | 444 | return false; |
445 | 445 | ||
446 | address_error: | 446 | address_error: |
447 | /* We can't support this address. Unmap it again. */ | 447 | /* We can't support this address. Unmap it again. */ |
448 | unmap_descbuffer(ring, addr, buffersize, dma_to_device); | 448 | unmap_descbuffer(ring, addr, buffersize, dma_to_device); |
449 | 449 | ||
450 | return 1; | 450 | return true; |
451 | } | 451 | } |
452 | 452 | ||
453 | static int setup_rx_descbuffer(struct b43legacy_dmaring *ring, | 453 | static int setup_rx_descbuffer(struct b43legacy_dmaring *ring, |
diff --git a/drivers/net/wireless/b43legacy/rfkill.c b/drivers/net/wireless/b43legacy/rfkill.c index c4559bcbc707..7c1bdbc02569 100644 --- a/drivers/net/wireless/b43legacy/rfkill.c +++ b/drivers/net/wireless/b43legacy/rfkill.c | |||
@@ -32,7 +32,7 @@ bool b43legacy_is_hw_radio_enabled(struct b43legacy_wldev *dev) | |||
32 | if (dev->dev->id.revision >= 3) { | 32 | if (dev->dev->id.revision >= 3) { |
33 | if (!(b43legacy_read32(dev, B43legacy_MMIO_RADIO_HWENABLED_HI) | 33 | if (!(b43legacy_read32(dev, B43legacy_MMIO_RADIO_HWENABLED_HI) |
34 | & B43legacy_MMIO_RADIO_HWENABLED_HI_MASK)) | 34 | & B43legacy_MMIO_RADIO_HWENABLED_HI_MASK)) |
35 | return 1; | 35 | return true; |
36 | } else { | 36 | } else { |
37 | /* To prevent CPU fault on PPC, do not read a register | 37 | /* To prevent CPU fault on PPC, do not read a register |
38 | * unless the interface is started; however, on resume | 38 | * unless the interface is started; however, on resume |
@@ -40,12 +40,12 @@ bool b43legacy_is_hw_radio_enabled(struct b43legacy_wldev *dev) | |||
40 | * that happens, unconditionally return TRUE. | 40 | * that happens, unconditionally return TRUE. |
41 | */ | 41 | */ |
42 | if (b43legacy_status(dev) < B43legacy_STAT_STARTED) | 42 | if (b43legacy_status(dev) < B43legacy_STAT_STARTED) |
43 | return 1; | 43 | return true; |
44 | if (b43legacy_read16(dev, B43legacy_MMIO_RADIO_HWENABLED_LO) | 44 | if (b43legacy_read16(dev, B43legacy_MMIO_RADIO_HWENABLED_LO) |
45 | & B43legacy_MMIO_RADIO_HWENABLED_LO_MASK) | 45 | & B43legacy_MMIO_RADIO_HWENABLED_LO_MASK) |
46 | return 1; | 46 | return true; |
47 | } | 47 | } |
48 | return 0; | 48 | return false; |
49 | } | 49 | } |
50 | 50 | ||
51 | /* The poll callback for the hardware button. */ | 51 | /* The poll callback for the hardware button. */ |
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c index 941b1e41f366..1c4e9dd57960 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c | |||
@@ -2949,5 +2949,5 @@ bool wlc_phy_txpower_ipa_ison(struct brcms_phy_pub *ppi) | |||
2949 | if (ISNPHY(pi)) | 2949 | if (ISNPHY(pi)) |
2950 | return wlc_phy_n_txpower_ipa_ison(pi); | 2950 | return wlc_phy_n_txpower_ipa_ison(pi); |
2951 | else | 2951 | else |
2952 | return 0; | 2952 | return false; |
2953 | } | 2953 | } |
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c index 5f1366234a0d..93d4cde0eb31 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c | |||
@@ -4999,7 +4999,7 @@ void wlc_2064_vco_cal(struct brcms_phy *pi) | |||
4999 | bool wlc_phy_tpc_isenabled_lcnphy(struct brcms_phy *pi) | 4999 | bool wlc_phy_tpc_isenabled_lcnphy(struct brcms_phy *pi) |
5000 | { | 5000 | { |
5001 | if (wlc_lcnphy_tempsense_based_pwr_ctrl_enabled(pi)) | 5001 | if (wlc_lcnphy_tempsense_based_pwr_ctrl_enabled(pi)) |
5002 | return 0; | 5002 | return false; |
5003 | else | 5003 | else |
5004 | return (LCNPHY_TX_PWR_CTRL_HW == | 5004 | return (LCNPHY_TX_PWR_CTRL_HW == |
5005 | wlc_lcnphy_get_tx_pwr_ctrl((pi))); | 5005 | wlc_lcnphy_get_tx_pwr_ctrl((pi))); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-config.h b/drivers/net/wireless/iwlwifi/iwl-config.h index 07e999a32a7f..3f33f753ce2f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-config.h +++ b/drivers/net/wireless/iwlwifi/iwl-config.h | |||
@@ -92,9 +92,9 @@ static inline bool iwl_has_secure_boot(u32 hw_rev, | |||
92 | { | 92 | { |
93 | /* return 1 only for family 8000 B0 */ | 93 | /* return 1 only for family 8000 B0 */ |
94 | if ((family == IWL_DEVICE_FAMILY_8000) && (hw_rev & 0xC)) | 94 | if ((family == IWL_DEVICE_FAMILY_8000) && (hw_rev & 0xC)) |
95 | return 1; | 95 | return true; |
96 | 96 | ||
97 | return 0; | 97 | return false; |
98 | } | 98 | } |
99 | 99 | ||
100 | /* | 100 | /* |