aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-04-21 12:49:33 -0700
committerKevin Hilman <khilman@linaro.org>2015-08-24 10:59:29 -0700
commit12b27ff59a1ecad4b4441bb1a56c0c7a62f71c73 (patch)
tree2f6c67ff508f947212975e80768f829e3863dbf0
parent7238a72b34bb9756007903bf2042ef40d8655b17 (diff)
media: remove unused variable that causes a warning
My 'allmodconfig' build is _almost_ free of warnings, and most of the remaining ones are for legacy drivers that just do bad things that I can't find it in my black heart to care too much about. But this one was just annoying me: drivers/media/v4l2-core/videobuf2-core.c:3256:26: warning: unused variable ‘fileio’ [-Wunused-variable] because commit 0e661006370b ("[media] vb2: fix 'UNBALANCED' warnings when calling vb2_thread_stop()") removed all users of 'fileio' and instead calls "__vb2_cleanup_fileio(q)" to clean up q->fileio. But the now unused 'fileio' variable was left around. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> (cherry picked from commit 1d11437f4fd02f9b5d3749675a1232216787dcc6) Signed-off-by: Kevin Hilman <khilman@linaro.org>
-rw-r--r--drivers/media/v4l2-core/videobuf2-core.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
index f2e43de3dd87..5c1977933c4d 100644
--- a/drivers/media/v4l2-core/videobuf2-core.c
+++ b/drivers/media/v4l2-core/videobuf2-core.c
@@ -3222,7 +3222,6 @@ EXPORT_SYMBOL_GPL(vb2_thread_start);
int vb2_thread_stop(struct vb2_queue *q)
{
struct vb2_threadio_data *threadio = q->threadio;
- struct vb2_fileio_data *fileio = q->fileio;
int err;
if (threadio == NULL)