[PATCH stable/3.18.y] media: remove unused variable that causes a warning

[PATCH stable/3.18.y] media: remove unused variable that causes a warning

[Kevin Hilman]

From: Linus Torvalds <torvalds@linux-foundation.org>

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)
Cc: <stable@vger.kernel.org> # v3.18+
Signed-off-by: Kevin Hilman <khilman@linaro.org>
---
 drivers/media/v4l2-core/videobuf2-core.c | 1 -
 1 file changed, 1 deletion(-)

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)
-- 
2.4.5

Re: [PATCH stable/3.18.y] media: remove unused variable that causes a warning

[Sasha Levin]

On 08/24/2015 02:02 PM, Kevin Hilman wrote:
> From: Linus Torvalds <torvalds@linux-foundation.org>
> 
> 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)
> Cc: <stable@vger.kernel.org> # v3.18+
> Signed-off-by: Kevin Hilman <khilman@linaro.org>

Hey Kevin,

I'm afraid this isn't -stable material: it doesn't fix and actual problem
that bothers users, so I can't take it.


Thanks,
Sasha

Re: [PATCH stable/3.18.y] media: remove unused variable that causes a warning

[Kevin Hilman]

Sasha Levin <sasha.levin@oracle.com> writes:

> On 08/24/2015 02:02 PM, Kevin Hilman wrote:
>> From: Linus Torvalds <torvalds@linux-foundation.org>
>> 
>> 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)
>> Cc: <stable@vger.kernel.org> # v3.18+
>> Signed-off-by: Kevin Hilman <khilman@linaro.org>
>
> Hey Kevin,
>
> I'm afraid this isn't -stable material: it doesn't fix and actual problem
> that bothers users, so I can't take it.

OK, no worries.  I wasn't clear if trival build fixes qualified. 

Thanks,

Kevin