diff options
author | Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> | 2015-09-29 05:21:18 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-04 05:59:03 -0400 |
commit | f975c5cdb53c1cfef18c28aaae8385e5d16bc104 (patch) | |
tree | e4e268b2510e52799fe51c85c2470e2a160ab81a | |
parent | 635e664a6b4d4b9c12f507045d156ea419b62dff (diff) |
usb: renesas_usbhs: fix build warning if 64-bit architecture
This patch fixes the following warning if 64-bit architecture environment:
./drivers/usb/renesas_usbhs/common.c:496:25: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
dparam->type = of_id ? (u32)of_id->data : 0;
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/renesas_usbhs/common.c | 2 | ||||
-rw-r--r-- | include/linux/usb/renesas_usbhs.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/renesas_usbhs/common.c b/drivers/usb/renesas_usbhs/common.c index 7b98e1d9194c..0ce398c5482e 100644 --- a/drivers/usb/renesas_usbhs/common.c +++ b/drivers/usb/renesas_usbhs/common.c | |||
@@ -493,7 +493,7 @@ static struct renesas_usbhs_platform_info *usbhs_parse_dt(struct device *dev) | |||
493 | return NULL; | 493 | return NULL; |
494 | 494 | ||
495 | dparam = &info->driver_param; | 495 | dparam = &info->driver_param; |
496 | dparam->type = of_id ? (u32)of_id->data : 0; | 496 | dparam->type = of_id ? (uintptr_t)of_id->data : 0; |
497 | if (!of_property_read_u32(dev->of_node, "renesas,buswait", &tmp)) | 497 | if (!of_property_read_u32(dev->of_node, "renesas,buswait", &tmp)) |
498 | dparam->buswait_bwait = tmp; | 498 | dparam->buswait_bwait = tmp; |
499 | gpio = of_get_named_gpio_flags(dev->of_node, "renesas,enable-gpio", 0, | 499 | gpio = of_get_named_gpio_flags(dev->of_node, "renesas,enable-gpio", 0, |
diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h index 3dd5a781da99..bfb74723f151 100644 --- a/include/linux/usb/renesas_usbhs.h +++ b/include/linux/usb/renesas_usbhs.h | |||
@@ -157,7 +157,7 @@ struct renesas_usbhs_driver_param { | |||
157 | */ | 157 | */ |
158 | int pio_dma_border; /* default is 64byte */ | 158 | int pio_dma_border; /* default is 64byte */ |
159 | 159 | ||
160 | u32 type; | 160 | uintptr_t type; |
161 | u32 enable_gpio; | 161 | u32 enable_gpio; |
162 | 162 | ||
163 | /* | 163 | /* |