diff mbox

x86/xen: clean up clang build warning

Message ID 20170918083817.26870-1-colin.king@canonical.com (mailing list archive)
State New, archived
Headers show

Commit Message

Colin King Sept. 18, 2017, 8:38 a.m. UTC
From: Colin Ian King <colin.king@canonical.com>

In the case where sizeof(maddr) != sizeof(long) p is initialized and
never read and clang throws a warning on this.  Move declaration of
p to clean up the clang build warning:

warning: Value stored to 'p' during its initialization is never read

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 arch/x86/include/asm/xen/hypercall.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Jürgen Groß Sept. 18, 2017, 8:43 a.m. UTC | #1
On 18/09/17 10:38, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> In the case where sizeof(maddr) != sizeof(long) p is initialized and
> never read and clang throws a warning on this.  Move declaration of
> p to clean up the clang build warning:
> 
> warning: Value stored to 'p' during its initialization is never read
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

With the code style issue pointed out below fixed:

Reviewed-by: Juergen Gross <jgross@suse.com>

> ---
>  arch/x86/include/asm/xen/hypercall.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h
> index 9606688caa4b..5ff77cb2529e 100644
> --- a/arch/x86/include/asm/xen/hypercall.h
> +++ b/arch/x86/include/asm/xen/hypercall.h
> @@ -552,13 +552,13 @@ static inline void
>  MULTI_update_descriptor(struct multicall_entry *mcl, u64 maddr,
>  			struct desc_struct desc)
>  {
> -	u32 *p = (u32 *) &desc;
> -
>  	mcl->op = __HYPERVISOR_update_descriptor;
>  	if (sizeof(maddr) == sizeof(long)) {
>  		mcl->args[0] = maddr;
>  		mcl->args[1] = *(unsigned long *)&desc;
>  	} else {
> +		u32 *p = (u32 *) &desc;

Please omit the space here      ^


Juergen

> +
>  		mcl->args[0] = maddr;
>  		mcl->args[1] = maddr >> 32;
>  		mcl->args[2] = *p++;
>
diff mbox

Patch

diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h
index 9606688caa4b..5ff77cb2529e 100644
--- a/arch/x86/include/asm/xen/hypercall.h
+++ b/arch/x86/include/asm/xen/hypercall.h
@@ -552,13 +552,13 @@  static inline void
 MULTI_update_descriptor(struct multicall_entry *mcl, u64 maddr,
 			struct desc_struct desc)
 {
-	u32 *p = (u32 *) &desc;
-
 	mcl->op = __HYPERVISOR_update_descriptor;
 	if (sizeof(maddr) == sizeof(long)) {
 		mcl->args[0] = maddr;
 		mcl->args[1] = *(unsigned long *)&desc;
 	} else {
+		u32 *p = (u32 *) &desc;
+
 		mcl->args[0] = maddr;
 		mcl->args[1] = maddr >> 32;
 		mcl->args[2] = *p++;