diff options
| author |   Rafał Miłecki <rafal@milecki.pl> | 2018-10-11 13:23:40 +0200 |
|---|---|---|
| committer |   Linus Walleij <linus.walleij@linaro.org> | 2018-10-12 11:14:59 +0200 |
| commit | ce7bdb957b8e3f1cbf0a3358f1deef385dff6502 (patch) | |
| tree | ea8b976211f42755033996a2ed0af0b8f2549df8 /drivers/pinctrl | |
| parent | pinctrl: madera: Fix uninitialized variable bug in madera_mux_set_mux (diff) | |
| download | linux-dev-ce7bdb957b8e3f1cbf0a3358f1deef385dff6502.tar.xz linux-dev-ce7bdb957b8e3f1cbf0a3358f1deef385dff6502.zip | |
pinctrl: bcm: ns: Use uintptr_t for casting data
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>
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/bcm/pinctrl-ns.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/bcm/pinctrl-ns.c b/drivers/pinctrl/bcm/pinctrl-ns.c index aedbb2813c50..d7f8175d2c1c 100644 --- a/drivers/pinctrl/bcm/pinctrl-ns.c +++ b/drivers/pinctrl/bcm/pinctrl-ns.c @@ -285,7 +285,7 @@ static int ns_pinctrl_probe(struct platform_device *pdev) of_id = of_match_device(ns_pinctrl_of_match_table, dev); if (!of_id) 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, "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]; i < ARRAY_SIZE(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) { memcpy(pin++, src, sizeof(*src)); |