summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2023-06-09 22:20:56 +0200
committerArnd Bergmann <arnd@arndb.de>2023-06-09 23:16:49 +0200
commit11ca605653480b2ddc70ec142a0a686796a7fc87 (patch)
tree213deeb21e0bf8e1b410703ed075c460d6426a35 /drivers/input
parentMerge tag 'samsung-soc-6.5' of https://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
downloadlinux-11ca605653480b2ddc70ec142a0a686796a7fc87.tar.xz
linux-11ca605653480b2ddc70ec142a0a686796a7fc87.zip
Input: ads7846 - fix pointer cast warning
The previous bugfix caused a warning on 64-bit builds: drivers/input/touchscreen/ads7846.c:1126:17: warning: cast to smaller integer type 'u32' (aka 'unsigned int') from 'const void *' [-Wvoid-pointer-to-int-cast] Change the cast back to something that works on both 32-bit and 64-bit kernels. Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202306100442.jStknDT1-lkp@intel.com/ Fixes: 8f7913c04f6a7 ("Input: ads7846 - Fix usage of match data") Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/ads7846.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index fe6fe8acd8a6..faea40dd66d0 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -1123,7 +1123,7 @@ static const struct ads7846_platform_data *ads7846_get_props(struct device *dev)
if (!pdata)
return ERR_PTR(-ENOMEM);
- pdata->model = (u32)device_get_match_data(dev);
+ pdata->model = (uintptr_t)device_get_match_data(dev);
device_property_read_u16(dev, "ti,vref-delay-usecs",
&pdata->vref_delay_usecs);