* [PATCH v1] gpiolib: Switch to use compat_need_64bit_alignment_fixup() helper
@ 2020-10-08 13:22 Andy Shevchenko
2020-10-08 13:42 ` Andy Shevchenko
0 siblings, 1 reply; 2+ messages in thread
From: Andy Shevchenko @ 2020-10-08 13:22 UTC (permalink / raw)
To: Linus Walleij, Bartosz Golaszewski, linux-gpio, Kent Gibson
Cc: Andy Shevchenko
The new compat_need_64bit_alignment_fixup() helper allows to avoid
ugly ifdefferu in IOCTL compatible code. Use it in GPIO cdev code.
Depends-on: 527c412519eb ("compat: add a compat_need_64bit_alignment_fixup() helper")
Depends-on: cc7886d25bca ("compat: lift compat_s64 and compat_u64 to <asm-generic/compat.h>")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/gpio/gpiolib-cdev.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/drivers/gpio/gpiolib-cdev.c b/drivers/gpio/gpiolib-cdev.c
index e9faeaf65d14..03f33521e737 100644
--- a/drivers/gpio/gpiolib-cdev.c
+++ b/drivers/gpio/gpiolib-cdev.c
@@ -1479,19 +1479,15 @@ static __poll_t lineevent_poll(struct file *file,
return events;
}
+struct compat_gpioeevent_data {
+ compat_u64 timestamp;
+ u32 id;
+};
+
static ssize_t lineevent_get_size(void)
{
-#if defined(CONFIG_X86_64) && !defined(CONFIG_UML)
- /* i386 has no padding after 'id' */
- if (in_ia32_syscall()) {
- struct compat_gpioeevent_data {
- compat_u64 timestamp;
- u32 id;
- };
-
+ if (compat_need_64bit_alignment_fixup())
return sizeof(struct compat_gpioeevent_data);
- }
-#endif
return sizeof(struct gpioevent_data);
}
--
2.28.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v1] gpiolib: Switch to use compat_need_64bit_alignment_fixup() helper
2020-10-08 13:22 [PATCH v1] gpiolib: Switch to use compat_need_64bit_alignment_fixup() helper Andy Shevchenko
@ 2020-10-08 13:42 ` Andy Shevchenko
0 siblings, 0 replies; 2+ messages in thread
From: Andy Shevchenko @ 2020-10-08 13:42 UTC (permalink / raw)
To: Linus Walleij, Bartosz Golaszewski, linux-gpio, Kent Gibson
On Thu, Oct 08, 2020 at 04:22:17PM +0300, Andy Shevchenko wrote:
> The new compat_need_64bit_alignment_fixup() helper allows to avoid
> ugly ifdefferu in IOCTL compatible code. Use it in GPIO cdev code.
There is v2 coming, don't consider this, thanks!
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-08 13:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-08 13:22 [PATCH v1] gpiolib: Switch to use compat_need_64bit_alignment_fixup() helper Andy Shevchenko
2020-10-08 13:42 ` Andy Shevchenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox