LinuxLists.cc - [PATCH] Input: atmel_mxt_ts - fix -Wunused-const-variable

2019-06-13 17:01:05

Subject: [PATCH] Input: atmel_mxt_ts - fix -Wunused-const-variable

2019-06-13 17:48:28

Subject: Re: [PATCH] Input: atmel_mxt_ts - fix -Wunused-const-variable

On Wed, Jun 12, 2019 at 4:58 PM 'Nathan Huckleberry' via Clang Built
Linux <[email protected]> wrote:
> Since mxt_video_fops is only used inside an ifdef. It should
> be moved inside the ifdef.

Thanks for the patch! I agree. I think it would be better and clearer
to sink the definition of `mxt_video_fops` down closer to its use,
immediately before the definition of `mxt_video_device`. Then it
would be closer to its use and it would also be within the existing
ifdef.

> +++ b/drivers/input/touchscreen/atmel_mxt_ts.c
> @@ -256,6 +256,7 @@ enum v4l_dbg_inputs {
> MXT_V4L_INPUT_MAX,
> };
>
> +#ifdef CONFIG_TOUCHSCREEN_ATMEL_MXT_T37
> static const struct v4l2_file_operations mxt_video_fops = {
> .owner = THIS_MODULE,
> .open = v4l2_fh_open,
> @@ -265,6 +266,7 @@ static const struct v4l2_file_operations mxt_video_fops = {
> .mmap = vb2_fop_mmap,
> .poll = vb2_fop_poll,
> };
> +#endif

--
Thanks,
~Nick Desaulniers

2019-06-13 18:24:47

by Nathan Huckleberry

[permalink] [raw]

Subject: [PATCH v2] Input: atmel_mxt_ts - fix -Wunused-const-variable

Clang produces the following warning

drivers/input/touchscreen/atmel_mxt_ts.c:259:42: warning: unused
variable 'mxt_video_fops' [-Wunused-const-variable]
static const struct v4l2_file_operations mxt_video_fops = {

Since mxt_video_fops is only used inside an ifdef. It should
be moved inside the ifdef.

Cc: [email protected]
Link: https://github.com/ClangBuiltLinux/linux/issues/527
Signed-off-by: Nathan Huckleberry <[email protected]>
---
Changes from v1 -> v2
* Moved definition of mxt_video_fops into existing ifdef
drivers/input/touchscreen/atmel_mxt_ts.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 19378f200c63..0dae381c6637 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -256,16 +256,6 @@ enum v4l_dbg_inputs {
MXT_V4L_INPUT_MAX,
};

-static const struct v4l2_file_operations mxt_video_fops = {
- .owner = THIS_MODULE,
- .open = v4l2_fh_open,
- .release = vb2_fop_release,
- .unlocked_ioctl = video_ioctl2,
- .read = vb2_fop_read,
- .mmap = vb2_fop_mmap,
- .poll = vb2_fop_poll,
-};
-
enum mxt_suspend_mode {
MXT_SUSPEND_DEEP_SLEEP = 0,
MXT_SUSPEND_T9_CTRL = 1,
@@ -2218,6 +2208,16 @@ static int mxt_init_t7_power_cfg(struct mxt_data *data)
}

#ifdef CONFIG_TOUCHSCREEN_ATMEL_MXT_T37
+static const struct v4l2_file_operations mxt_video_fops = {
+ .owner = THIS_MODULE,
+ .open = v4l2_fh_open,
+ .release = vb2_fop_release,
+ .unlocked_ioctl = video_ioctl2,
+ .read = vb2_fop_read,
+ .mmap = vb2_fop_mmap,
+ .poll = vb2_fop_poll,
+};
+
static u16 mxt_get_debug_value(struct mxt_data *data, unsigned int x,
unsigned int y)
{
--
2.22.0.rc2.383.gf4fbbf30c2-goog

2019-06-13 18:29:15

by Nick Desaulniers

[permalink] [raw]

Subject: Re: [PATCH v2] Input: atmel_mxt_ts - fix -Wunused-const-variable

On Thu, Jun 13, 2019 at 11:24 AM 'Nathan Huckleberry' via Clang Built
Linux <[email protected]> wrote:
> Changes from v1 -> v2
> * Moved definition of mxt_video_fops into existing ifdef

Thanks for the v2.
Reviewed-by: Nick Desaulniers <[email protected]>

> --- a/drivers/input/touchscreen/atmel_mxt_ts.c
> +++ b/drivers/input/touchscreen/atmel_mxt_ts.c
> @@ -256,16 +256,6 @@ enum v4l_dbg_inputs {
> MXT_V4L_INPUT_MAX,
> };
>
> -static const struct v4l2_file_operations mxt_video_fops = {
> - .owner = THIS_MODULE,
> - .open = v4l2_fh_open,
> - .release = vb2_fop_release,
> - .unlocked_ioctl = video_ioctl2,
> - .read = vb2_fop_read,
> - .mmap = vb2_fop_mmap,
> - .poll = vb2_fop_poll,
> -};
> -
> enum mxt_suspend_mode {
> MXT_SUSPEND_DEEP_SLEEP = 0,
> MXT_SUSPEND_T9_CTRL = 1,
> @@ -2218,6 +2208,16 @@ static int mxt_init_t7_power_cfg(struct mxt_data *data)
> }
>
> #ifdef CONFIG_TOUCHSCREEN_ATMEL_MXT_T37
> +static const struct v4l2_file_operations mxt_video_fops = {
> + .owner = THIS_MODULE,
> + .open = v4l2_fh_open,
> + .release = vb2_fop_release,
> + .unlocked_ioctl = video_ioctl2,
> + .read = vb2_fop_read,
> + .mmap = vb2_fop_mmap,
> + .poll = vb2_fop_poll,
> +};
> +

--
Thanks,
~Nick Desaulniers

2019-07-01 08:31:54

by Dmitry Torokhov

[permalink] [raw]

Subject: Re: [PATCH v2] Input: atmel_mxt_ts - fix -Wunused-const-variable

On Thu, Jun 13, 2019 at 11:26:41AM -0700, Nick Desaulniers wrote:
> On Thu, Jun 13, 2019 at 11:24 AM 'Nathan Huckleberry' via Clang Built
> Linux <[email protected]> wrote:
> > Changes from v1 -> v2
> > * Moved definition of mxt_video_fops into existing ifdef
>
> Thanks for the v2.
> Reviewed-by: Nick Desaulniers <[email protected]>

Applied, thank you.

>
> > --- a/drivers/input/touchscreen/atmel_mxt_ts.c
> > +++ b/drivers/input/touchscreen/atmel_mxt_ts.c
> > @@ -256,16 +256,6 @@ enum v4l_dbg_inputs {
> > MXT_V4L_INPUT_MAX,
> > };
> >
> > -static const struct v4l2_file_operations mxt_video_fops = {
> > - .owner = THIS_MODULE,
> > - .open = v4l2_fh_open,
> > - .release = vb2_fop_release,
> > - .unlocked_ioctl = video_ioctl2,
> > - .read = vb2_fop_read,
> > - .mmap = vb2_fop_mmap,
> > - .poll = vb2_fop_poll,
> > -};
> > -
> > enum mxt_suspend_mode {
> > MXT_SUSPEND_DEEP_SLEEP = 0,
> > MXT_SUSPEND_T9_CTRL = 1,
> > @@ -2218,6 +2208,16 @@ static int mxt_init_t7_power_cfg(struct mxt_data *data)
> > }
> >
> > #ifdef CONFIG_TOUCHSCREEN_ATMEL_MXT_T37
> > +static const struct v4l2_file_operations mxt_video_fops = {
> > + .owner = THIS_MODULE,
> > + .open = v4l2_fh_open,
> > + .release = vb2_fop_release,
> > + .unlocked_ioctl = video_ioctl2,
> > + .read = vb2_fop_read,
> > + .mmap = vb2_fop_mmap,
> > + .poll = vb2_fop_poll,
> > +};
> > +
>
> --
> Thanks,
> ~Nick Desaulniers

--
Dmitry