From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sun, 20 May 2012 13:13:23 +0000 (-0300)
Subject: [media] lg2160: Fix a few warnings
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5444a1b76b3eb7e0acdaece07cfe2e2a4305bb77;p=~shefty%2Frdma-dev.git

[media] lg2160: Fix a few warnings

drivers/media/dvb/frontends/lg2160.c: In function ‘lg216x_read_ucblocks’:
drivers/media/dvb/frontends/lg2160.c:1336:1: warning: label ‘fail’ defined but not used [-Wunused-label]
drivers/media/dvb/frontends/lg2160.c:1325:6: warning: unused variable ‘ret’ [-Wunused-variable]
drivers/media/dvb/frontends/lg2160.c:1324:23: warning: unused variable ‘state’ [-Wunused-variable]
drivers/media/dvb/frontends/lg2160.c: In function ‘lg216x_set_ensemble’:
drivers/media/dvb/frontends/lg2160.c:420:23: warning: ‘reg’ may be used uninitialized in this function [-Wuninitialized]

Cc: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/dvb/frontends/lg2160.c b/drivers/media/dvb/frontends/lg2160.c
index 7bc28421752..a3ab1a5b659 100644
--- a/drivers/media/dvb/frontends/lg2160.c
+++ b/drivers/media/dvb/frontends/lg2160.c
@@ -413,6 +413,7 @@ static int lg216x_set_ensemble(struct lg216x_state *state, int id)
 		reg = 0x0400;
 		break;
 	case LG2161:
+	default:
 		reg = 0x0500;
 		break;
 	}
@@ -1321,19 +1322,20 @@ fail:
 
 static int lg216x_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
 {
+#if 0
 	struct lg216x_state *state = fe->demodulator_priv;
 	int ret;
-#if 0
+
 	ret = lg216x_read_rs_err_count(state,
 				       &fe->dtv_property_cache.atscmh_rs_err);
 	if (lg_fail(ret))
 		goto fail;
 
 	*ucblocks = fe->dtv_property_cache.atscmh_rs_err;
+fail:
 #else
 	*ucblocks = 0;
 #endif
-fail:
 	return 0;
 }