080-v4.20-0002-pinctrl-bcm-ns-Use-uintptr_t-for-casting-data.patch 1.5 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. From ce7bdb957b8e3f1cbf0a3358f1deef385dff6502 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <[email protected]>
  3. Date: Thu, 11 Oct 2018 13:23:40 +0200
  4. Subject: [PATCH] pinctrl: bcm: ns: Use uintptr_t for casting data
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. Fix up a compiler error on 64bit architectures where pointers
  9. and integers differ in size.
  10. Suggested-by: Arnd Bergmann <[email protected]>
  11. Signed-off-by: Rafał Miłecki <[email protected]>
  12. Signed-off-by: Linus Walleij <[email protected]>
  13. ---
  14. drivers/pinctrl/bcm/pinctrl-ns.c | 4 ++--
  15. 1 file changed, 2 insertions(+), 2 deletions(-)
  16. --- a/drivers/pinctrl/bcm/pinctrl-ns.c
  17. +++ b/drivers/pinctrl/bcm/pinctrl-ns.c
  18. @@ -285,7 +285,7 @@ static int ns_pinctrl_probe(struct platf
  19. of_id = of_match_device(ns_pinctrl_of_match_table, dev);
  20. if (!of_id)
  21. return -EINVAL;
  22. - ns_pinctrl->chipset_flag = (unsigned int)of_id->data;
  23. + ns_pinctrl->chipset_flag = (uintptr_t)of_id->data;
  24. res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
  25. "cru_gpio_control");
  26. @@ -307,7 +307,7 @@ static int ns_pinctrl_probe(struct platf
  27. for (i = 0, pin = (struct pinctrl_pin_desc *)&pctldesc->pins[0];
  28. i < ARRAY_SIZE(ns_pinctrl_pins); i++) {
  29. const struct pinctrl_pin_desc *src = &ns_pinctrl_pins[i];
  30. - unsigned int chipsets = (unsigned int)src->drv_data;
  31. + unsigned int chipsets = (uintptr_t)src->drv_data;
  32. if (chipsets & ns_pinctrl->chipset_flag) {
  33. memcpy(pin++, src, sizeof(*src));