From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Jones Date: Mon, 15 Feb 2016 13:49:12 +0000 Subject: [kvm-unit-tests PATCH v4 03/17] lib: asm-generic: add missing casts Message-Id: <1455544166-19766-4-git-send-email-drjones@redhat.com> List-Id: References: <1455544166-19766-1-git-send-email-drjones@redhat.com> In-Reply-To: <1455544166-19766-1-git-send-email-drjones@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Cc: thuth@redhat.com, dgibson@redhat.com, david@gibson.dropbear.id.au, agraf@suse.de, lvivier@redhat.com, pbonzini@redhat.com Signed-off-by: Andrew Jones Reviewed-by: David Gibson Tested-by: Laurent Vivier --- lib/asm-generic/io.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/asm-generic/io.h b/lib/asm-generic/io.h index a9939d3a5921f..931415a465b74 100644 --- a/lib/asm-generic/io.h +++ b/lib/asm-generic/io.h @@ -104,27 +104,27 @@ static inline u64 __bswap64(u64 x) #endif #define le16_to_cpu(x) \ - ({ u16 __r = __cpu_is_be() ? __bswap16(x) : (x); __r; }) + ({ u16 __r = __cpu_is_be() ? __bswap16(x) : ((u16)x); __r; }) #define cpu_to_le16 le16_to_cpu #define le32_to_cpu(x) \ - ({ u32 __r = __cpu_is_be() ? __bswap32(x) : (x); __r; }) + ({ u32 __r = __cpu_is_be() ? __bswap32(x) : ((u32)x); __r; }) #define cpu_to_le32 le32_to_cpu #define le64_to_cpu(x) \ - ({ u64 __r = __cpu_is_be() ? __bswap64(x) : (x); __r; }) + ({ u64 __r = __cpu_is_be() ? __bswap64(x) : ((u64)x); __r; }) #define cpu_to_le64 le64_to_cpu #define be16_to_cpu(x) \ - ({ u16 __r = !__cpu_is_be() ? __bswap16(x) : (x); __r; }) + ({ u16 __r = !__cpu_is_be() ? __bswap16(x) : ((u16)x); __r; }) #define cpu_to_be16 be16_to_cpu #define be32_to_cpu(x) \ - ({ u32 __r = !__cpu_is_be() ? __bswap32(x) : (x); __r; }) + ({ u32 __r = !__cpu_is_be() ? __bswap32(x) : ((u32)x); __r; }) #define cpu_to_be32 be32_to_cpu #define be64_to_cpu(x) \ - ({ u64 __r = !__cpu_is_be() ? __bswap64(x) : (x); __r; }) + ({ u64 __r = !__cpu_is_be() ? __bswap64(x) : ((u64)x); __r; }) #define cpu_to_be64 be64_to_cpu #ifndef rmb -- 2.4.3