2023-05-01 02:58:01

by Tom Rix

[permalink] [raw]
Subject: [PATCH] tty: define hung_up_tty_compat_ioctl with CONFIG_COMPAT

gcc reports
drivers/tty/tty_io.c:446:13: error: ‘hung_up_tty_compat_ioctl’
defined but not used [-Werror=unused-function]
446 | static long hung_up_tty_compat_ioctl(struct file *file,
| ^~~~~~~~~~~~~~~~~~~~~~~~

hung_up_tty_compat_ioctl is used conditionally with CONFIG_COMPAT,
so it should be likewise defined.

Signed-off-by: Tom Rix <[email protected]>
---
drivers/tty/tty_io.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 553182753098..7fe404d56ce7 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -443,11 +443,13 @@ static long hung_up_tty_ioctl(struct file *file, unsigned int cmd,
return cmd == TIOCSPGRP ? -ENOTTY : -EIO;
}

+#ifdef CONFIG_COMPAT
static long hung_up_tty_compat_ioctl(struct file *file,
unsigned int cmd, unsigned long arg)
{
return cmd == TIOCSPGRP ? -ENOTTY : -EIO;
}
+#endif

static int hung_up_tty_fasync(int fd, struct file *file, int on)
{
--
2.27.0


2023-05-02 05:07:23

by Jiri Slaby

[permalink] [raw]
Subject: Re: [PATCH] tty: define hung_up_tty_compat_ioctl with CONFIG_COMPAT

On 01. 05. 23, 4:56, Tom Rix wrote:
> gcc reports
> drivers/tty/tty_io.c:446:13: error: ‘hung_up_tty_compat_ioctl’
> defined but not used [-Werror=unused-function]
> 446 | static long hung_up_tty_compat_ioctl(struct file *file,
> | ^~~~~~~~~~~~~~~~~~~~~~~~
>
> hung_up_tty_compat_ioctl is used conditionally with CONFIG_COMPAT,
> so it should be likewise defined.



> Signed-off-by: Tom Rix <[email protected]>
> ---
> drivers/tty/tty_io.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
> index 553182753098..7fe404d56ce7 100644
> --- a/drivers/tty/tty_io.c
> +++ b/drivers/tty/tty_io.c
> @@ -443,11 +443,13 @@ static long hung_up_tty_ioctl(struct file *file, unsigned int cmd,
> return cmd == TIOCSPGRP ? -ENOTTY : -EIO;
> }
>
> +#ifdef CONFIG_COMPAT
> static long hung_up_tty_compat_ioctl(struct file *file,
> unsigned int cmd, unsigned long arg)
> {
> return cmd == TIOCSPGRP ? -ENOTTY : -EIO;
> }
> +#endif
>
> static int hung_up_tty_fasync(int fd, struct file *file, int on)
> {

Hi,

Arnd sent a better fix already:
https://lore.kernel.org/all/[email protected]/

thanks,
--
js
suse labs