aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Huckleberry <nhuck@google.com>2019-07-01 04:03:25 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2019-07-01 04:21:16 -0400
commit5cecc2bccc03f5f7b496b43a80fd5b768d44f13c (patch)
tree9730d728aa1cf9130fd452aa31d48c182e66c484
parent8d3c60c7688ec17c084417b7f6ac57a1d5f154e1 (diff)
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. Link: https://github.com/ClangBuiltLinux/linux/issues/527 Signed-off-by: Nathan Huckleberry <nhuck@google.com> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/touchscreen/atmel_mxt_ts.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 5c63d25ce84e..d530aade0103 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -261,16 +261,6 @@ enum v4l_dbg_inputs {
261 MXT_V4L_INPUT_MAX, 261 MXT_V4L_INPUT_MAX,
262}; 262};
263 263
264static const struct v4l2_file_operations mxt_video_fops = {
265 .owner = THIS_MODULE,
266 .open = v4l2_fh_open,
267 .release = vb2_fop_release,
268 .unlocked_ioctl = video_ioctl2,
269 .read = vb2_fop_read,
270 .mmap = vb2_fop_mmap,
271 .poll = vb2_fop_poll,
272};
273
274enum mxt_suspend_mode { 264enum mxt_suspend_mode {
275 MXT_SUSPEND_DEEP_SLEEP = 0, 265 MXT_SUSPEND_DEEP_SLEEP = 0,
276 MXT_SUSPEND_T9_CTRL = 1, 266 MXT_SUSPEND_T9_CTRL = 1,
@@ -2223,6 +2213,16 @@ recheck:
2223} 2213}
2224 2214
2225#ifdef CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 2215#ifdef CONFIG_TOUCHSCREEN_ATMEL_MXT_T37
2216static const struct v4l2_file_operations mxt_video_fops = {
2217 .owner = THIS_MODULE,
2218 .open = v4l2_fh_open,
2219 .release = vb2_fop_release,
2220 .unlocked_ioctl = video_ioctl2,
2221 .read = vb2_fop_read,
2222 .mmap = vb2_fop_mmap,
2223 .poll = vb2_fop_poll,
2224};
2225
2226static u16 mxt_get_debug_value(struct mxt_data *data, unsigned int x, 2226static u16 mxt_get_debug_value(struct mxt_data *data, unsigned int x,
2227 unsigned int y) 2227 unsigned int y)
2228{ 2228{