Commit adedf37b authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller

rocker: fix harmless warning on 32-bit machines

The rocker driver tries to assign a pointer to a 64-bit integer
and then back to a pointer. This is safe on all architectures,
but causes a compiler warning when pointers are shorter than
64-bit:

rocker/rocker.c: In function 'rocker_desc_cookie_ptr_get':
rocker/rocker.c:809:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
  return (void *) desc_info->desc->cookie;
         ^

This adds another cast to uintptr_t to tell the compiler
that it's safe.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 06640310
...@@ -806,13 +806,13 @@ static bool rocker_desc_gen(struct rocker_desc_info *desc_info) ...@@ -806,13 +806,13 @@ static bool rocker_desc_gen(struct rocker_desc_info *desc_info)
static void *rocker_desc_cookie_ptr_get(struct rocker_desc_info *desc_info) static void *rocker_desc_cookie_ptr_get(struct rocker_desc_info *desc_info)
{ {
return (void *) desc_info->desc->cookie; return (void *)(uintptr_t)desc_info->desc->cookie;
} }
static void rocker_desc_cookie_ptr_set(struct rocker_desc_info *desc_info, static void rocker_desc_cookie_ptr_set(struct rocker_desc_info *desc_info,
void *ptr) void *ptr)
{ {
desc_info->desc->cookie = (long) ptr; desc_info->desc->cookie = (uintptr_t) ptr;
} }
static struct rocker_desc_info * static struct rocker_desc_info *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment