korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-26 05:34:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

pinctrl: bcm: ns: Use uintptr_t for casting data

Browse Source 
Fix up a compiler error on 64bit architectures where pointers
and integers differ in size.

Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Rafał Miłecki 2018-10-11 13:23:40 +02:00 committed by Linus Walleij
parent 4fe81669df
commit ce7bdb957b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pinctrl/bcm/pinctrl-ns.c
View File

@ -285,7 +285,7 @@ static int ns_pinctrl_probe(struct platform_device *pdev)
of_id = of_match_device(ns_pinctrl_of_match_table, dev); of_id = of_match_device(ns_pinctrl_of_match_table, dev);
if (!of_id) if (!of_id)
return -EINVAL; return -EINVAL;
ns_pinctrl->chipset_flag = (unsigned int)of_id->data; ns_pinctrl->chipset_flag = (uintptr_t)of_id->data;
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
"cru_gpio_control"); "cru_gpio_control");
@ -307,7 +307,7 @@ static int ns_pinctrl_probe(struct platform_device *pdev)
for (i = 0, pin = (struct pinctrl_pin_desc *)&pctldesc->pins[0]; for (i = 0, pin = (struct pinctrl_pin_desc *)&pctldesc->pins[0];
i < ARRAY_SIZE(ns_pinctrl_pins); i++) { i < ARRAY_SIZE(ns_pinctrl_pins); i++) {
const struct pinctrl_pin_desc *src = &ns_pinctrl_pins[i]; const struct pinctrl_pin_desc *src = &ns_pinctrl_pins[i];
unsigned int chipsets = (unsigned int)src->drv_data; unsigned int chipsets = (uintptr_t)src->drv_data;
if (chipsets & ns_pinctrl->chipset_flag) { if (chipsets & ns_pinctrl->chipset_flag) {
memcpy(pin++, src, sizeof(*src)); memcpy(pin++, src, sizeof(*src));