Driver has a trivial helper function to convert
the pointer argument and then call the native ioctl handler.
But now we have a generic implementation for that, so we can use it.
Signed-off-by: Harshal Chaudhari <[email protected]>
---
drivers/misc/xilinx_sdfec.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/misc/xilinx_sdfec.c b/drivers/misc/xilinx_sdfec.c
index 92291292756a..6f252793dceb 100644
--- a/drivers/misc/xilinx_sdfec.c
+++ b/drivers/misc/xilinx_sdfec.c
@@ -1016,14 +1016,6 @@ static long xsdfec_dev_ioctl(struct file *fptr, unsigned int cmd,
return rval;
}
-#ifdef CONFIG_COMPAT
-static long xsdfec_dev_compat_ioctl(struct file *file, unsigned int cmd,
- unsigned long data)
-{
- return xsdfec_dev_ioctl(file, cmd, (unsigned long)compat_ptr(data));
-}
-#endif
-
static __poll_t xsdfec_poll(struct file *file, poll_table *wait)
{
__poll_t mask = 0;
@@ -1054,9 +1046,7 @@ static const struct file_operations xsdfec_fops = {
.release = xsdfec_dev_release,
.unlocked_ioctl = xsdfec_dev_ioctl,
.poll = xsdfec_poll,
-#ifdef CONFIG_COMPAT
- .compat_ioctl = xsdfec_dev_compat_ioctl,
-#endif
+ .compat_ioctl = compat_ptr_ioctl,
};
static int xsdfec_parse_of(struct xsdfec_dev *xsdfec)
--
2.17.1
Hi Harshal,
The code change is fine, no comment,
but testing will be done at the beginning of the next week.
Sorry for the late reply,
Regards
Dragan
> -----Original Message-----
> From: Harshal Chaudhari <[email protected]>
> Sent: Monday 26 October 2020 15:58
> To: [email protected]
> Cc: Derek Kiernan <[email protected]>; Dragan Cvetic <[email protected]>; [email protected]; Michal Simek
> <[email protected]>; [email protected]; [email protected]
> Subject: [PATCH] misc: xilinx_sdfec: add compat_ptr_ioctl()
>
> Driver has a trivial helper function to convert
> the pointer argument and then call the native ioctl handler.
> But now we have a generic implementation for that, so we can use it.
>
> Signed-off-by: Harshal Chaudhari <[email protected]>
> ---
> drivers/misc/xilinx_sdfec.c | 12 +-----------
> 1 file changed, 1 insertion(+), 11 deletions(-)
>
> diff --git a/drivers/misc/xilinx_sdfec.c b/drivers/misc/xilinx_sdfec.c
> index 92291292756a..6f252793dceb 100644
> --- a/drivers/misc/xilinx_sdfec.c
> +++ b/drivers/misc/xilinx_sdfec.c
> @@ -1016,14 +1016,6 @@ static long xsdfec_dev_ioctl(struct file *fptr, unsigned int cmd,
> return rval;
> }
>
> -#ifdef CONFIG_COMPAT
> -static long xsdfec_dev_compat_ioctl(struct file *file, unsigned int cmd,
> - unsigned long data)
> -{
> - return xsdfec_dev_ioctl(file, cmd, (unsigned long)compat_ptr(data));
> -}
> -#endif
> -
> static __poll_t xsdfec_poll(struct file *file, poll_table *wait)
> {
> __poll_t mask = 0;
> @@ -1054,9 +1046,7 @@ static const struct file_operations xsdfec_fops = {
> .release = xsdfec_dev_release,
> .unlocked_ioctl = xsdfec_dev_ioctl,
> .poll = xsdfec_poll,
> -#ifdef CONFIG_COMPAT
> - .compat_ioctl = xsdfec_dev_compat_ioctl,
> -#endif
> + .compat_ioctl = compat_ptr_ioctl,
> };
>
> static int xsdfec_parse_of(struct xsdfec_dev *xsdfec)
> --
> 2.17.1
On Mon, Oct 26, 2020 at 4:58 PM Harshal Chaudhari
<[email protected]> wrote:
>
> Driver has a trivial helper function to convert
> the pointer argument and then call the native ioctl handler.
> But now we have a generic implementation for that, so we can use it.
>
> Signed-off-by: Harshal Chaudhari <[email protected]>
Reviewed-by: Arnd Bergmann <[email protected]>
On Fri, Oct 30, 2020 at 3:47 PM Dragan Cvetic <[email protected]> wrote:
>
> Hi Harshal,
>
> The code change is fine, no comment,
> but testing will be done at the beginning of the next week.
> Sorry for the late reply,
Thanks for your attention Dragan. i have send the another patch for
to remove argument and command checks, so i request you to please
look into this patch and kindly confirm if anything needs to change
or any possibility.
Thanks once again.
> Regards
> Dragan
>
>
> > -----Original Message-----
> > From: Harshal Chaudhari <[email protected]>
> > Sent: Monday 26 October 2020 15:58
> > To: [email protected]
> > Cc: Derek Kiernan <[email protected]>; Dragan Cvetic <[email protected]>; [email protected]; Michal Simek
> > <[email protected]>; [email protected]; [email protected]
> > Subject: [PATCH] misc: xilinx_sdfec: add compat_ptr_ioctl()
> >
> > Driver has a trivial helper function to convert
> > the pointer argument and then call the native ioctl handler.
> > But now we have a generic implementation for that, so we can use it.
> >
> > Signed-off-by: Harshal Chaudhari <[email protected]>
> > ---
> > drivers/misc/xilinx_sdfec.c | 12 +-----------
> > 1 file changed, 1 insertion(+), 11 deletions(-)
> >
> > diff --git a/drivers/misc/xilinx_sdfec.c b/drivers/misc/xilinx_sdfec.c
> > index 92291292756a..6f252793dceb 100644
> > --- a/drivers/misc/xilinx_sdfec.c
> > +++ b/drivers/misc/xilinx_sdfec.c
> > @@ -1016,14 +1016,6 @@ static long xsdfec_dev_ioctl(struct file *fptr, unsigned int cmd,
> > return rval;
> > }
> >
> > -#ifdef CONFIG_COMPAT
> > -static long xsdfec_dev_compat_ioctl(struct file *file, unsigned int cmd,
> > - unsigned long data)
> > -{
> > - return xsdfec_dev_ioctl(file, cmd, (unsigned long)compat_ptr(data));
> > -}
> > -#endif
> > -
> > static __poll_t xsdfec_poll(struct file *file, poll_table *wait)
> > {
> > __poll_t mask = 0;
> > @@ -1054,9 +1046,7 @@ static const struct file_operations xsdfec_fops = {
> > .release = xsdfec_dev_release,
> > .unlocked_ioctl = xsdfec_dev_ioctl,
> > .poll = xsdfec_poll,
> > -#ifdef CONFIG_COMPAT
> > - .compat_ioctl = xsdfec_dev_compat_ioctl,
> > -#endif
> > + .compat_ioctl = compat_ptr_ioctl,
> > };
> >
> > static int xsdfec_parse_of(struct xsdfec_dev *xsdfec)
> > --
> > 2.17.1
>
> -----Original Message-----
> From: Harshal Chaudhari <[email protected]>
> Sent: Monday 26 October 2020 15:58
> To: [email protected]
> Cc: Derek Kiernan <[email protected]>; Dragan Cvetic <[email protected]>; [email protected]; Michal Simek
> <[email protected]>; [email protected]; [email protected]
> Subject: [PATCH] misc: xilinx_sdfec: add compat_ptr_ioctl()
>
> Driver has a trivial helper function to convert
> the pointer argument and then call the native ioctl handler.
> But now we have a generic implementation for that, so we can use it.
>
> Signed-off-by: Harshal Chaudhari <[email protected]>
> ---
> drivers/misc/xilinx_sdfec.c | 12 +-----------
> 1 file changed, 1 insertion(+), 11 deletions(-)
>
> diff --git a/drivers/misc/xilinx_sdfec.c b/drivers/misc/xilinx_sdfec.c
> index 92291292756a..6f252793dceb 100644
> --- a/drivers/misc/xilinx_sdfec.c
> +++ b/drivers/misc/xilinx_sdfec.c
> @@ -1016,14 +1016,6 @@ static long xsdfec_dev_ioctl(struct file *fptr, unsigned int cmd,
> return rval;
> }
>
> -#ifdef CONFIG_COMPAT
> -static long xsdfec_dev_compat_ioctl(struct file *file, unsigned int cmd,
> - unsigned long data)
> -{
> - return xsdfec_dev_ioctl(file, cmd, (unsigned long)compat_ptr(data));
> -}
> -#endif
> -
> static __poll_t xsdfec_poll(struct file *file, poll_table *wait)
> {
> __poll_t mask = 0;
> @@ -1054,9 +1046,7 @@ static const struct file_operations xsdfec_fops = {
> .release = xsdfec_dev_release,
> .unlocked_ioctl = xsdfec_dev_ioctl,
> .poll = xsdfec_poll,
> -#ifdef CONFIG_COMPAT
> - .compat_ioctl = xsdfec_dev_compat_ioctl,
> -#endif
> + .compat_ioctl = compat_ptr_ioctl,
> };
>
> static int xsdfec_parse_of(struct xsdfec_dev *xsdfec)
> --
> 2.17.1
Acked-by: Dragan Cvetic <[email protected]>