diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2016-12-10 23:34:53 -0500 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2016-12-15 17:13:41 -0500 |
| commit | 9efeccacd3a486128d3add611dd4cefb5b60a58c (patch) | |
| tree | 5d23034005e2856ac141a91547d39cb38717c72f | |
| parent | 46d832f5e2102cce455672c5a0b8cbe97e27fe42 (diff) | |
linux: drop __bitwise__ everywhere
__bitwise__ used to mean "yes, please enable sparse checks
unconditionally", but now that we dropped __CHECK_ENDIAN__
__bitwise is exactly the same.
There aren't many users, replace it by __bitwise everywhere.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Stefan Schmidt <stefan@osg.samsung.com>
Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
Akced-by: Lee Duncan <lduncan@suse.com>
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/gpio-cfg.h | 2 | ||||
| -rw-r--r-- | drivers/md/dm-cache-block-types.h | 6 | ||||
| -rw-r--r-- | drivers/net/ethernet/sun/sunhme.h | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h | 4 | ||||
| -rw-r--r-- | include/linux/mmzone.h | 2 | ||||
| -rw-r--r-- | include/linux/serial_core.h | 4 | ||||
| -rw-r--r-- | include/linux/types.h | 4 | ||||
| -rw-r--r-- | include/scsi/iscsi_proto.h | 2 | ||||
| -rw-r--r-- | include/target/target_core_base.h | 2 | ||||
| -rw-r--r-- | include/uapi/linux/virtio_types.h | 6 | ||||
| -rw-r--r-- | net/ieee802154/6lowpan/6lowpan_i.h | 2 | ||||
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 4 |
12 files changed, 20 insertions, 20 deletions
diff --git a/arch/arm/plat-samsung/include/plat/gpio-cfg.h b/arch/arm/plat-samsung/include/plat/gpio-cfg.h index 21391faab068..e55d1f597db8 100644 --- a/arch/arm/plat-samsung/include/plat/gpio-cfg.h +++ b/arch/arm/plat-samsung/include/plat/gpio-cfg.h | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 28 | 28 | ||
| 29 | typedef unsigned int __bitwise__ samsung_gpio_pull_t; | 29 | typedef unsigned int __bitwise samsung_gpio_pull_t; |
| 30 | 30 | ||
| 31 | /* forward declaration if gpio-core.h hasn't been included */ | 31 | /* forward declaration if gpio-core.h hasn't been included */ |
| 32 | struct samsung_gpio_chip; | 32 | struct samsung_gpio_chip; |
diff --git a/drivers/md/dm-cache-block-types.h b/drivers/md/dm-cache-block-types.h index bed4ad4e1b7c..389c9e8ac785 100644 --- a/drivers/md/dm-cache-block-types.h +++ b/drivers/md/dm-cache-block-types.h | |||
| @@ -17,9 +17,9 @@ | |||
| 17 | * discard bitset. | 17 | * discard bitset. |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | typedef dm_block_t __bitwise__ dm_oblock_t; | 20 | typedef dm_block_t __bitwise dm_oblock_t; |
| 21 | typedef uint32_t __bitwise__ dm_cblock_t; | 21 | typedef uint32_t __bitwise dm_cblock_t; |
| 22 | typedef dm_block_t __bitwise__ dm_dblock_t; | 22 | typedef dm_block_t __bitwise dm_dblock_t; |
| 23 | 23 | ||
| 24 | static inline dm_oblock_t to_oblock(dm_block_t b) | 24 | static inline dm_oblock_t to_oblock(dm_block_t b) |
| 25 | { | 25 | { |
diff --git a/drivers/net/ethernet/sun/sunhme.h b/drivers/net/ethernet/sun/sunhme.h index f4307654e4ae..4a8d5b18dfd5 100644 --- a/drivers/net/ethernet/sun/sunhme.h +++ b/drivers/net/ethernet/sun/sunhme.h | |||
| @@ -302,7 +302,7 @@ | |||
| 302 | * Always write the address first before setting the ownership | 302 | * Always write the address first before setting the ownership |
| 303 | * bits to avoid races with the hardware scanning the ring. | 303 | * bits to avoid races with the hardware scanning the ring. |
| 304 | */ | 304 | */ |
| 305 | typedef u32 __bitwise__ hme32; | 305 | typedef u32 __bitwise hme32; |
| 306 | 306 | ||
| 307 | struct happy_meal_rxd { | 307 | struct happy_meal_rxd { |
| 308 | hme32 rx_flags; | 308 | hme32 rx_flags; |
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h b/drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h index 1ad0ec180d5d..84813b550ef1 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h +++ b/drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h | |||
| @@ -228,7 +228,7 @@ enum iwl_ucode_tlv_flag { | |||
| 228 | IWL_UCODE_TLV_FLAGS_BCAST_FILTERING = BIT(29), | 228 | IWL_UCODE_TLV_FLAGS_BCAST_FILTERING = BIT(29), |
| 229 | }; | 229 | }; |
| 230 | 230 | ||
| 231 | typedef unsigned int __bitwise__ iwl_ucode_tlv_api_t; | 231 | typedef unsigned int __bitwise iwl_ucode_tlv_api_t; |
| 232 | 232 | ||
| 233 | /** | 233 | /** |
| 234 | * enum iwl_ucode_tlv_api - ucode api | 234 | * enum iwl_ucode_tlv_api - ucode api |
| @@ -258,7 +258,7 @@ enum iwl_ucode_tlv_api { | |||
| 258 | #endif | 258 | #endif |
| 259 | }; | 259 | }; |
| 260 | 260 | ||
| 261 | typedef unsigned int __bitwise__ iwl_ucode_tlv_capa_t; | 261 | typedef unsigned int __bitwise iwl_ucode_tlv_capa_t; |
| 262 | 262 | ||
| 263 | /** | 263 | /** |
| 264 | * enum iwl_ucode_tlv_capa - ucode capabilities | 264 | * enum iwl_ucode_tlv_capa - ucode capabilities |
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 0f088f3a2fed..36d9896fbc1e 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h | |||
| @@ -246,7 +246,7 @@ struct lruvec { | |||
| 246 | #define ISOLATE_UNEVICTABLE ((__force isolate_mode_t)0x8) | 246 | #define ISOLATE_UNEVICTABLE ((__force isolate_mode_t)0x8) |
| 247 | 247 | ||
| 248 | /* LRU Isolation modes. */ | 248 | /* LRU Isolation modes. */ |
| 249 | typedef unsigned __bitwise__ isolate_mode_t; | 249 | typedef unsigned __bitwise isolate_mode_t; |
| 250 | 250 | ||
| 251 | enum zone_watermarks { | 251 | enum zone_watermarks { |
| 252 | WMARK_MIN, | 252 | WMARK_MIN, |
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 5d494888a612..5def8e830fb0 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h | |||
| @@ -111,8 +111,8 @@ struct uart_icount { | |||
| 111 | __u32 buf_overrun; | 111 | __u32 buf_overrun; |
| 112 | }; | 112 | }; |
| 113 | 113 | ||
| 114 | typedef unsigned int __bitwise__ upf_t; | 114 | typedef unsigned int __bitwise upf_t; |
| 115 | typedef unsigned int __bitwise__ upstat_t; | 115 | typedef unsigned int __bitwise upstat_t; |
| 116 | 116 | ||
| 117 | struct uart_port { | 117 | struct uart_port { |
| 118 | spinlock_t lock; /* port lock */ | 118 | spinlock_t lock; /* port lock */ |
diff --git a/include/linux/types.h b/include/linux/types.h index baf718324f4a..d501ad3ba247 100644 --- a/include/linux/types.h +++ b/include/linux/types.h | |||
| @@ -154,8 +154,8 @@ typedef u64 dma_addr_t; | |||
| 154 | typedef u32 dma_addr_t; | 154 | typedef u32 dma_addr_t; |
| 155 | #endif | 155 | #endif |
| 156 | 156 | ||
| 157 | typedef unsigned __bitwise__ gfp_t; | 157 | typedef unsigned __bitwise gfp_t; |
| 158 | typedef unsigned __bitwise__ fmode_t; | 158 | typedef unsigned __bitwise fmode_t; |
| 159 | 159 | ||
| 160 | #ifdef CONFIG_PHYS_ADDR_T_64BIT | 160 | #ifdef CONFIG_PHYS_ADDR_T_64BIT |
| 161 | typedef u64 phys_addr_t; | 161 | typedef u64 phys_addr_t; |
diff --git a/include/scsi/iscsi_proto.h b/include/scsi/iscsi_proto.h index c1260d80ef30..df156f1d50b2 100644 --- a/include/scsi/iscsi_proto.h +++ b/include/scsi/iscsi_proto.h | |||
| @@ -74,7 +74,7 @@ static inline int iscsi_sna_gte(u32 n1, u32 n2) | |||
| 74 | #define zero_data(p) {p[0]=0;p[1]=0;p[2]=0;} | 74 | #define zero_data(p) {p[0]=0;p[1]=0;p[2]=0;} |
| 75 | 75 | ||
| 76 | /* initiator tags; opaque for target */ | 76 | /* initiator tags; opaque for target */ |
| 77 | typedef uint32_t __bitwise__ itt_t; | 77 | typedef uint32_t __bitwise itt_t; |
| 78 | /* below makes sense only for initiator that created this tag */ | 78 | /* below makes sense only for initiator that created this tag */ |
| 79 | #define build_itt(itt, age) ((__force itt_t)\ | 79 | #define build_itt(itt, age) ((__force itt_t)\ |
| 80 | ((itt) | ((age) << ISCSI_AGE_SHIFT))) | 80 | ((itt) | ((age) << ISCSI_AGE_SHIFT))) |
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h index c2119008990a..00558287936d 100644 --- a/include/target/target_core_base.h +++ b/include/target/target_core_base.h | |||
| @@ -149,7 +149,7 @@ enum se_cmd_flags_table { | |||
| 149 | * Used by transport_send_check_condition_and_sense() | 149 | * Used by transport_send_check_condition_and_sense() |
| 150 | * to signal which ASC/ASCQ sense payload should be built. | 150 | * to signal which ASC/ASCQ sense payload should be built. |
| 151 | */ | 151 | */ |
| 152 | typedef unsigned __bitwise__ sense_reason_t; | 152 | typedef unsigned __bitwise sense_reason_t; |
| 153 | 153 | ||
| 154 | enum tcm_sense_reason_table { | 154 | enum tcm_sense_reason_table { |
| 155 | #define R(x) (__force sense_reason_t )(x) | 155 | #define R(x) (__force sense_reason_t )(x) |
diff --git a/include/uapi/linux/virtio_types.h b/include/uapi/linux/virtio_types.h index e845e8c4cbee..55c3b738722c 100644 --- a/include/uapi/linux/virtio_types.h +++ b/include/uapi/linux/virtio_types.h | |||
| @@ -39,8 +39,8 @@ | |||
| 39 | * - __le{16,32,64} for standard-compliant virtio devices | 39 | * - __le{16,32,64} for standard-compliant virtio devices |
| 40 | */ | 40 | */ |
| 41 | 41 | ||
| 42 | typedef __u16 __bitwise__ __virtio16; | 42 | typedef __u16 __bitwise __virtio16; |
| 43 | typedef __u32 __bitwise__ __virtio32; | 43 | typedef __u32 __bitwise __virtio32; |
| 44 | typedef __u64 __bitwise__ __virtio64; | 44 | typedef __u64 __bitwise __virtio64; |
| 45 | 45 | ||
| 46 | #endif /* _UAPI_LINUX_VIRTIO_TYPES_H */ | 46 | #endif /* _UAPI_LINUX_VIRTIO_TYPES_H */ |
diff --git a/net/ieee802154/6lowpan/6lowpan_i.h b/net/ieee802154/6lowpan/6lowpan_i.h index 5ac778962e4e..ac7c96b73ad5 100644 --- a/net/ieee802154/6lowpan/6lowpan_i.h +++ b/net/ieee802154/6lowpan/6lowpan_i.h | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | #include <net/inet_frag.h> | 7 | #include <net/inet_frag.h> |
| 8 | #include <net/6lowpan.h> | 8 | #include <net/6lowpan.h> |
| 9 | 9 | ||
| 10 | typedef unsigned __bitwise__ lowpan_rx_result; | 10 | typedef unsigned __bitwise lowpan_rx_result; |
| 11 | #define RX_CONTINUE ((__force lowpan_rx_result) 0u) | 11 | #define RX_CONTINUE ((__force lowpan_rx_result) 0u) |
| 12 | #define RX_DROP_UNUSABLE ((__force lowpan_rx_result) 1u) | 12 | #define RX_DROP_UNUSABLE ((__force lowpan_rx_result) 1u) |
| 13 | #define RX_DROP ((__force lowpan_rx_result) 2u) | 13 | #define RX_DROP ((__force lowpan_rx_result) 2u) |
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index d37a577f63a1..b2069fbd60f9 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
| @@ -159,7 +159,7 @@ enum ieee80211_bss_valid_data_flags { | |||
| 159 | IEEE80211_BSS_VALID_ERP = BIT(3) | 159 | IEEE80211_BSS_VALID_ERP = BIT(3) |
| 160 | }; | 160 | }; |
| 161 | 161 | ||
| 162 | typedef unsigned __bitwise__ ieee80211_tx_result; | 162 | typedef unsigned __bitwise ieee80211_tx_result; |
| 163 | #define TX_CONTINUE ((__force ieee80211_tx_result) 0u) | 163 | #define TX_CONTINUE ((__force ieee80211_tx_result) 0u) |
| 164 | #define TX_DROP ((__force ieee80211_tx_result) 1u) | 164 | #define TX_DROP ((__force ieee80211_tx_result) 1u) |
| 165 | #define TX_QUEUED ((__force ieee80211_tx_result) 2u) | 165 | #define TX_QUEUED ((__force ieee80211_tx_result) 2u) |
| @@ -180,7 +180,7 @@ struct ieee80211_tx_data { | |||
| 180 | }; | 180 | }; |
| 181 | 181 | ||
| 182 | 182 | ||
| 183 | typedef unsigned __bitwise__ ieee80211_rx_result; | 183 | typedef unsigned __bitwise ieee80211_rx_result; |
| 184 | #define RX_CONTINUE ((__force ieee80211_rx_result) 0u) | 184 | #define RX_CONTINUE ((__force ieee80211_rx_result) 0u) |
| 185 | #define RX_DROP_UNUSABLE ((__force ieee80211_rx_result) 1u) | 185 | #define RX_DROP_UNUSABLE ((__force ieee80211_rx_result) 1u) |
| 186 | #define RX_DROP_MONITOR ((__force ieee80211_rx_result) 2u) | 186 | #define RX_DROP_MONITOR ((__force ieee80211_rx_result) 2u) |
