media: remove unused variable that causes a warning 72/175672/1
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Apr 2015 19:49:33 +0000 (12:49 -0700)
committerSeung-Woo Kim <sw0312.kim@samsung.com>
Wed, 11 Apr 2018 09:33:40 +0000 (18:33 +0900)
commit 1d11437f4fd02f9b5d3749675a1232216787dcc6 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[sw0312.kim: cherry-pick from linux-3.18.y]
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Change-Id: Ibcc1613a6740e15d51218a4373647f262088c1d1

drivers/media/v4l2-core/videobuf2-core.c

index 282525d0d60c9fa798838785b3cd6f03967f02b8..077f7baa9a997d0f0068034be158a3045d4bf3f8 100644 (file)
@@ -3324,7 +3324,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 __attribute__((__unused__)) *fileio = q->fileio;
        int err;
 
        if (threadio == NULL)