OSDN Git Service

[IA64] sn: Do not needlessly convert between pointers and integers
authorThierry Reding <treding@nvidia.com>
Mon, 28 Jul 2014 15:01:49 +0000 (17:01 +0200)
committerTony Luck <tony.luck@intel.com>
Tue, 29 Jul 2014 23:28:15 +0000 (16:28 -0700)
The nasid_to_try variable is an array of integers, so plain integers can
be used when assigning values to the elements rather than casting a NULL
pointer to an integer, which results in the following warning from GCC:

arch/ia64/sn/kernel/bte.c:117:22: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
    nasid_to_try[1] = (int)NULL;
                      ^
arch/ia64/sn/kernel/bte.c:125:22: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
    nasid_to_try[1] = (int)NULL;
                      ^

Replace (int)NULL with a simple 0 to silence these warnings.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
arch/ia64/sn/kernel/bte.c

index cad775a..b2eb484 100644 (file)
@@ -114,7 +114,7 @@ bte_result_t bte_copy(u64 src, u64 dest, u64 len, u64 mode, void *notification)
                if (mode & BTE_USE_ANY) {
                        nasid_to_try[1] = my_nasid;
                } else {
-                       nasid_to_try[1] = (int)NULL;
+                       nasid_to_try[1] = 0;
                }
        } else {
                /* try local then remote */
@@ -122,7 +122,7 @@ bte_result_t bte_copy(u64 src, u64 dest, u64 len, u64 mode, void *notification)
                if (mode & BTE_USE_ANY) {
                        nasid_to_try[1] = NASID_GET(dest);
                } else {
-                       nasid_to_try[1] = (int)NULL;
+                       nasid_to_try[1] = 0;
                }
        }