From: Arnd Bergmann <arnd@arndb.de> To: Alexander Viro <viro@zeniv.linux.org.uk> Cc: linux-fsdevel@vger.kernel.org, y2038@lists.linaro.org, linux-kernel@vger.kernel.org, "Arnd Bergmann" <arnd@arndb.de>, "Bartlomiej Zolnierkiewicz" <b.zolnierkie@samsung.com>, "Mikulas Patocka" <mpatocka@redhat.com>, "David S. Miller" <davem@davemloft.net>, "Ville Syrjälä" <syrjala@sci.fi>, dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Subject: [PATCH v3 14/26] compat_ioctl: move ATYFB_CLK handling to atyfb driver Date: Tue, 16 Apr 2019 22:25:35 +0200 [thread overview] Message-ID: <20190416202701.127745-3-arnd@arndb.de> (raw) In-Reply-To: <20190416202701.127745-1-arnd@arndb.de> These are two obscure ioctl commands, in a driver that only has compatible commands, so just let the driver handle this itself. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/video/fbdev/aty/atyfb_base.c | 12 +++++++++++- fs/compat_ioctl.c | 2 -- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c index b6fe103df145..1bc4b6672fdc 100644 --- a/drivers/video/fbdev/aty/atyfb_base.c +++ b/drivers/video/fbdev/aty/atyfb_base.c @@ -48,7 +48,7 @@ ******************************************************************************/ - +#include <linux/compat.h> #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/kernel.h> @@ -235,6 +235,13 @@ static int atyfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info); static int atyfb_blank(int blank, struct fb_info *info); static int atyfb_ioctl(struct fb_info *info, u_int cmd, u_long arg); +#ifdef CONFIG_COMPAT +static int atyfb_compat_ioctl(struct fb_info *info, u_int cmd, u_long arg) +{ + return atyfb_ioctl(info, cmd, (u_long)compat_ptr(arg)); +} +#endif + #ifdef __sparc__ static int atyfb_mmap(struct fb_info *info, struct vm_area_struct *vma); #endif @@ -290,6 +297,9 @@ static struct fb_ops atyfb_ops = { .fb_pan_display = atyfb_pan_display, .fb_blank = atyfb_blank, .fb_ioctl = atyfb_ioctl, +#ifdef CONFIG_COMPAT + .fb_compat_ioctl = atyfb_compat_ioctl, +#endif .fb_fillrect = atyfb_fillrect, .fb_copyarea = atyfb_copyarea, .fb_imageblit = atyfb_imageblit, diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 6eb7a3f51702..a0f230650de2 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -637,8 +637,6 @@ COMPATIBLE_IOCTL(CAPI_CLR_FLAGS) COMPATIBLE_IOCTL(CAPI_NCCI_OPENCOUNT) COMPATIBLE_IOCTL(CAPI_NCCI_GETUNIT) /* Misc. */ -COMPATIBLE_IOCTL(0x41545900) /* ATYIO_CLKR */ -COMPATIBLE_IOCTL(0x41545901) /* ATYIO_CLKW */ COMPATIBLE_IOCTL(PCIIOC_CONTROLLER) COMPATIBLE_IOCTL(PCIIOC_MMAP_IS_IO) COMPATIBLE_IOCTL(PCIIOC_MMAP_IS_MEM) -- 2.20.0
WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@arndb.de> To: Alexander Viro <viro@zeniv.linux.org.uk> Cc: linux-fsdevel@vger.kernel.org, y2038@lists.linaro.org, linux-kernel@vger.kernel.org, "Arnd Bergmann" <arnd@arndb.de>, "Bartlomiej Zolnierkiewicz" <b.zolnierkie@samsung.com>, "Mikulas Patocka" <mpatocka@redhat.com>, "David S. Miller" <davem@davemloft.net>, "Ville Syrjälä" <syrjala@sci.fi>, dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Subject: [PATCH v3 14/26] compat_ioctl: move ATYFB_CLK handling to atyfb driver Date: Tue, 16 Apr 2019 20:25:35 +0000 [thread overview] Message-ID: <20190416202701.127745-3-arnd@arndb.de> (raw) In-Reply-To: <20190416202701.127745-1-arnd@arndb.de> These are two obscure ioctl commands, in a driver that only has compatible commands, so just let the driver handle this itself. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/video/fbdev/aty/atyfb_base.c | 12 +++++++++++- fs/compat_ioctl.c | 2 -- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c index b6fe103df145..1bc4b6672fdc 100644 --- a/drivers/video/fbdev/aty/atyfb_base.c +++ b/drivers/video/fbdev/aty/atyfb_base.c @@ -48,7 +48,7 @@ ******************************************************************************/ - +#include <linux/compat.h> #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/kernel.h> @@ -235,6 +235,13 @@ static int atyfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info); static int atyfb_blank(int blank, struct fb_info *info); static int atyfb_ioctl(struct fb_info *info, u_int cmd, u_long arg); +#ifdef CONFIG_COMPAT +static int atyfb_compat_ioctl(struct fb_info *info, u_int cmd, u_long arg) +{ + return atyfb_ioctl(info, cmd, (u_long)compat_ptr(arg)); +} +#endif + #ifdef __sparc__ static int atyfb_mmap(struct fb_info *info, struct vm_area_struct *vma); #endif @@ -290,6 +297,9 @@ static struct fb_ops atyfb_ops = { .fb_pan_display = atyfb_pan_display, .fb_blank = atyfb_blank, .fb_ioctl = atyfb_ioctl, +#ifdef CONFIG_COMPAT + .fb_compat_ioctl = atyfb_compat_ioctl, +#endif .fb_fillrect = atyfb_fillrect, .fb_copyarea = atyfb_copyarea, .fb_imageblit = atyfb_imageblit, diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 6eb7a3f51702..a0f230650de2 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -637,8 +637,6 @@ COMPATIBLE_IOCTL(CAPI_CLR_FLAGS) COMPATIBLE_IOCTL(CAPI_NCCI_OPENCOUNT) COMPATIBLE_IOCTL(CAPI_NCCI_GETUNIT) /* Misc. */ -COMPATIBLE_IOCTL(0x41545900) /* ATYIO_CLKR */ -COMPATIBLE_IOCTL(0x41545901) /* ATYIO_CLKW */ COMPATIBLE_IOCTL(PCIIOC_CONTROLLER) COMPATIBLE_IOCTL(PCIIOC_MMAP_IS_IO) COMPATIBLE_IOCTL(PCIIOC_MMAP_IS_MEM) -- 2.20.0
next prev parent reply other threads:[~2019-04-16 20:28 UTC|newest] Thread overview: 160+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-16 20:19 [PATCH v3 00/26] compat_ioctl: cleanups Arnd Bergmann 2019-04-16 20:19 ` Arnd Bergmann 2019-04-16 20:19 ` Arnd Bergmann 2019-04-16 20:19 ` Arnd Bergmann 2019-04-16 20:19 ` Arnd Bergmann 2019-04-16 20:19 ` Arnd Bergmann 2019-04-16 20:19 ` [PATCH v3 01/26] compat_ioctl: pppoe: fix PPPOEIOCSFWD handling Arnd Bergmann 2019-04-16 20:19 ` [PATCH v3 02/26] compat_ioctl: move simple ppp command handling into driver Arnd Bergmann 2019-04-16 20:19 ` Arnd Bergmann 2019-04-17 21:13 ` Al Viro 2019-04-17 21:13 ` Al Viro 2019-04-17 22:03 ` Arnd Bergmann 2019-04-17 22:03 ` Arnd Bergmann 2019-04-17 23:53 ` Al Viro 2019-04-17 23:53 ` Al Viro 2019-04-18 5:57 ` Al Viro 2019-04-18 5:57 ` Al Viro 2019-04-18 15:14 ` Arnd Bergmann 2019-04-18 15:14 ` Arnd Bergmann 2019-04-16 20:19 ` [PATCH v3 03/26] compat_ioctl: avoid unused function warning for do_ioctl Arnd Bergmann 2019-04-16 20:19 ` [PATCH v3 04/26] compat_ioctl: move PPPIOCSCOMPRESS32 to ppp-generic.c Arnd Bergmann 2019-04-16 20:19 ` Arnd Bergmann 2019-04-17 21:16 ` Al Viro 2019-04-17 21:16 ` Al Viro 2019-04-17 21:44 ` Arnd Bergmann 2019-04-17 21:44 ` Arnd Bergmann 2019-04-16 20:19 ` [PATCH v3 05/26] compat_ioctl: move PPPIOCSPASS32/PPPIOCSACTIVE32 to ppp_generic.c Arnd Bergmann 2019-04-16 20:19 ` Arnd Bergmann 2019-04-16 20:19 ` [PATCH v3 06/26] compat_ioctl: handle PPPIOCGIDLE for 64-bit time_t Arnd Bergmann 2019-04-16 20:19 ` Arnd Bergmann 2019-04-16 20:19 ` [PATCH v3 07/26] compat_ioctl: move rtc handling into rtc-dev.c Arnd Bergmann 2019-04-16 20:19 ` [PATCH v3 08/26] compat_ioctl: add compat_ptr_ioctl() Arnd Bergmann 2019-04-17 21:19 ` Al Viro 2019-04-17 21:34 ` Arnd Bergmann 2019-04-16 20:19 ` [PATCH v3 09/26] compat_ioctl: move drivers to compat_ptr_ioctl Arnd Bergmann 2019-04-16 20:19 ` Arnd Bergmann 2019-04-16 20:19 ` Arnd Bergmann 2019-04-16 20:19 ` Arnd Bergmann 2019-04-16 20:19 ` [v3,09/26] " Arnd Bergmann 2019-04-16 20:19 ` [PATCH v3 09/26] " Arnd Bergmann 2019-04-16 20:31 ` Jiri Kosina 2019-04-16 20:31 ` Jiri Kosina 2019-04-16 20:31 ` Jiri Kosina 2019-04-16 20:31 ` Jiri Kosina 2019-04-16 20:31 ` [v3,09/26] " Jiri Kosina 2019-04-16 20:31 ` [PATCH v3 09/26] " Jiri Kosina 2019-04-18 11:10 ` Stefan Hajnoczi 2019-04-18 11:10 ` Stefan Hajnoczi 2019-04-18 11:10 ` Stefan Hajnoczi 2019-04-18 11:10 ` Stefan Hajnoczi 2019-04-18 11:10 ` [v3,09/26] " Stefan Hajnoczi 2019-04-18 11:10 ` [PATCH v3 09/26] " Stefan Hajnoczi 2019-04-19 23:16 ` Michael S. Tsirkin 2019-04-19 23:16 ` Michael S. Tsirkin 2019-04-19 23:16 ` Michael S. Tsirkin 2019-04-19 23:16 ` Michael S. Tsirkin 2019-04-19 23:16 ` [v3,09/26] " Michael S. Tsirkin 2019-04-19 23:16 ` [PATCH v3 09/26] " Michael S. Tsirkin 2019-04-20 8:03 ` Winkler, Tomas 2019-04-20 8:03 ` Winkler, Tomas 2019-04-20 8:03 ` Winkler, Tomas 2019-04-20 8:03 ` Winkler, Tomas 2019-04-16 20:19 ` [PATCH v3 10/26] compat_ioctl: use correct compat_ptr() translation in drivers Arnd Bergmann 2019-04-16 20:19 ` Arnd Bergmann 2019-04-16 20:19 ` Arnd Bergmann 2019-04-16 20:19 ` [v3,10/26] " Arnd Bergmann 2019-04-17 21:21 ` [PATCH v3 10/26] " Al Viro 2019-04-17 21:21 ` Al Viro 2019-04-17 21:21 ` Al Viro 2019-04-17 21:21 ` [v3,10/26] " Al Viro 2019-04-16 20:19 ` [PATCH v3 11/26] ceph: fix compat_ioctl for ceph_dir_operations Arnd Bergmann 2019-04-17 21:23 ` Al Viro 2019-04-17 21:31 ` Arnd Bergmann [not found] ` <20190416202013.4034148-1-arnd-r2nGTMty4D4@public.gmane.org> 2019-04-16 20:25 ` [PATCH v3 12/26] compat_ioctl: move more drivers to compat_ptr_ioctl Arnd Bergmann 2019-04-16 20:25 ` Arnd Bergmann 2019-04-16 20:25 ` [v3,12/26] " Arnd Bergmann 2019-04-16 20:25 ` [PATCH v3 12/26] " Arnd Bergmann 2019-04-16 20:25 ` [PATCH v3 13/26] compat_ioctl: move tape handling into drivers Arnd Bergmann 2019-04-16 20:25 ` Arnd Bergmann [this message] 2019-04-16 20:25 ` [PATCH v3 14/26] compat_ioctl: move ATYFB_CLK handling to atyfb driver Arnd Bergmann 2019-04-17 21:27 ` Al Viro 2019-04-17 21:27 ` Al Viro 2019-04-17 21:28 ` Al Viro 2019-04-17 21:28 ` Al Viro 2019-05-06 13:37 ` Bartlomiej Zolnierkiewicz 2019-05-06 13:37 ` Bartlomiej Zolnierkiewicz 2019-05-06 13:37 ` Bartlomiej Zolnierkiewicz 2019-04-16 20:25 ` [PATCH v3 15/26] compat_ioctl: move isdn/capi ioctl translation into driver Arnd Bergmann 2019-04-16 20:25 ` [PATCH v3 16/26] compat_ioctl: move rfcomm handlers " Arnd Bergmann 2019-04-16 20:25 ` [PATCH v3 17/26] compat_ioctl: move hci_sock " Arnd Bergmann 2019-04-16 20:25 ` [PATCH v3 18/26] compat_ioctl: remove HCIUART handling Arnd Bergmann 2019-04-16 20:25 ` [PATCH v3 19/26] compat_ioctl: remove HIDIO translation Arnd Bergmann 2019-04-17 9:46 ` [PATCH v3 12/26] compat_ioctl: move more drivers to compat_ptr_ioctl Marc Gonzalez 2019-04-25 15:21 ` Mauro Carvalho Chehab 2019-04-25 15:21 ` Mauro Carvalho Chehab 2019-04-25 15:21 ` [v3,12/26] " Mauro Carvalho Chehab 2019-04-25 15:21 ` [PATCH v3 12/26] " Mauro Carvalho Chehab 2019-04-25 15:32 ` Arnd Bergmann 2019-04-25 15:32 ` Arnd Bergmann 2019-04-25 15:32 ` [v3,12/26] " Arnd Bergmann 2019-04-25 15:32 ` [PATCH v3 12/26] " Arnd Bergmann 2019-04-25 15:32 ` Arnd Bergmann 2019-04-25 15:35 ` Al Viro 2019-04-25 15:35 ` Al Viro 2019-04-25 15:35 ` [v3,12/26] " Al Viro 2019-04-25 15:35 ` [PATCH v3 12/26] " Al Viro 2019-04-25 15:53 ` Mauro Carvalho Chehab 2019-04-25 15:53 ` Mauro Carvalho Chehab 2019-04-25 15:53 ` [v3,12/26] " Mauro Carvalho Chehab 2019-04-25 15:53 ` [PATCH v3 12/26] " Mauro Carvalho Chehab [not found] ` <20190425153534.GS2217-3bDd1+5oDREiFSDQTTA3OLVCufUGDwFn@public.gmane.org> 2019-04-25 15:55 ` Arnd Bergmann 2019-04-25 15:55 ` Arnd Bergmann 2019-04-25 15:55 ` [v3,12/26] " Arnd Bergmann 2019-04-25 15:55 ` [PATCH v3 12/26] " Arnd Bergmann 2019-04-25 15:55 ` Arnd Bergmann 2019-04-25 16:42 ` Al Viro 2019-04-25 16:42 ` Al Viro 2019-04-25 16:42 ` [v3,12/26] " Al Viro 2019-04-25 16:42 ` [PATCH v3 12/26] " Al Viro 2019-04-25 16:42 ` Al Viro [not found] ` <CAK8P3a2HmiYQJ2FV2FgLiFsD8M9UKteC9Jetx7ja06PQVZWYfA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2019-04-25 21:25 ` Johannes Berg 2019-04-25 21:25 ` Johannes Berg 2019-04-25 21:25 ` [v3,12/26] " Johannes Berg 2019-04-25 21:25 ` [PATCH v3 12/26] " Johannes Berg [not found] ` <5511420228cb38d08a67c0f6a614b7671d7d23d4.camel-cdvu00un1VgdHxzADdlk8Q@public.gmane.org> 2019-04-26 7:46 ` Arnd Bergmann 2019-04-26 7:46 ` Arnd Bergmann 2019-04-26 7:46 ` [v3,12/26] " Arnd Bergmann 2019-04-26 7:46 ` [PATCH v3 12/26] " Arnd Bergmann 2019-04-26 7:46 ` Arnd Bergmann 2019-04-16 20:28 ` [PATCH v3 20/26] compat_ioctl: remove translation for sound ioctls Arnd Bergmann 2019-04-16 20:28 ` Arnd Bergmann 2019-04-16 20:28 ` [PATCH v3 21/26] compat_ioctl: remove IGNORE_IOCTL() Arnd Bergmann 2019-04-16 20:28 ` [PATCH v3 22/26] compat_ioctl: remove /dev/random commands Arnd Bergmann 2019-04-16 20:28 ` [PATCH v3 23/26] compat_ioctl: remove joystick ioctl translation Arnd Bergmann 2019-04-16 20:28 ` [PATCH v3 24/26] compat_ioctl: remove PCI " Arnd Bergmann 2019-04-16 20:28 ` [PATCH v3 25/26] compat_ioctl: remove /dev/raw " Arnd Bergmann 2019-04-16 20:28 ` [PATCH v3 26/26] compat_ioctl: remove last RAID handling code Arnd Bergmann 2019-04-17 8:05 ` [PATCH v3 20/26] compat_ioctl: remove translation for sound ioctls Takashi Iwai 2019-04-17 8:05 ` Takashi Iwai 2019-04-17 8:05 ` Takashi Iwai 2019-04-29 7:05 ` Takashi Iwai 2019-04-29 7:05 ` Takashi Iwai 2019-04-29 7:05 ` Takashi Iwai 2019-04-29 12:43 ` Arnd Bergmann 2019-04-29 12:43 ` Arnd Bergmann 2019-04-16 22:33 ` [PATCH v3 00/26] compat_ioctl: cleanups Douglas Gilbert 2019-04-16 22:33 ` Douglas Gilbert 2019-04-16 22:33 ` Douglas Gilbert 2019-04-16 22:33 ` Douglas Gilbert 2019-04-16 22:33 ` Douglas Gilbert 2019-04-16 22:33 ` Douglas Gilbert 2019-04-17 9:26 ` Arnd Bergmann 2019-04-17 9:26 ` Arnd Bergmann 2019-04-17 9:26 ` Arnd Bergmann 2019-04-17 9:26 ` Arnd Bergmann 2019-05-06 9:03 ` Andy Shevchenko 2019-05-06 9:03 ` Andy Shevchenko 2019-05-06 9:03 ` Andy Shevchenko 2019-05-06 9:03 ` Andy Shevchenko 2019-05-06 9:03 ` Andy Shevchenko
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190416202701.127745-3-arnd@arndb.de \ --to=arnd@arndb.de \ --cc=b.zolnierkie@samsung.com \ --cc=davem@davemloft.net \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-fbdev@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mpatocka@redhat.com \ --cc=syrjala@sci.fi \ --cc=viro@zeniv.linux.org.uk \ --cc=y2038@lists.linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.