[PATCH 1/3] media: cxd2880: Makefile: remove an include

[PATCH 1/3] media: cxd2880: Makefile: remove an include

[Mauro Carvalho Chehab]

It is not needed anymore to include the dvb-core directory,
as all the public headers that used to be there was moved
to include/media.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---
 drivers/media/dvb-frontends/cxd2880/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/media/dvb-frontends/cxd2880/Makefile b/drivers/media/dvb-frontends/cxd2880/Makefile
index 65a5d37f28cc..c6baa4caba19 100644
--- a/drivers/media/dvb-frontends/cxd2880/Makefile
+++ b/drivers/media/dvb-frontends/cxd2880/Makefile
@@ -15,5 +15,4 @@ cxd2880-objs := cxd2880_common.o \
 
 obj-$(CONFIG_DVB_CXD2880) += cxd2880.o
 
-ccflags-y += -Idrivers/media/dvb-core
 ccflags-y += -Idrivers/media/dvb-frontends
-- 
2.14.3

[PATCH 2/3] media: cxd2880: don't return unitialized values

[Mauro Carvalho Chehab]

drivers/media/dvb-frontends/cxd2880/cxd2880_devio_spi.c:59 cxd2880_io_spi_read_reg() error: uninitialized symbol 'ret'.
drivers/media/dvb-frontends/cxd2880/cxd2880_devio_spi.c:111 cxd2880_io_spi_write_reg() error: uninitialized symbol 'ret'.
drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd.c:2985 cxd2880_tnrdmd_set_cfg() error: uninitialized symbol 'ret'.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---
 drivers/media/dvb-frontends/cxd2880/cxd2880_devio_spi.c | 4 ++--
 drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd.c    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/media/dvb-frontends/cxd2880/cxd2880_devio_spi.c b/drivers/media/dvb-frontends/cxd2880/cxd2880_devio_spi.c
index d2e37c95d748..aba59400859e 100644
--- a/drivers/media/dvb-frontends/cxd2880/cxd2880_devio_spi.c
+++ b/drivers/media/dvb-frontends/cxd2880/cxd2880_devio_spi.c
@@ -16,7 +16,7 @@ static int cxd2880_io_spi_read_reg(struct cxd2880_io *io,
 				   u8 sub_address, u8 *data,
 				   u32 size)
 {
-	int ret;
+	int ret = 0;
 	struct cxd2880_spi *spi = NULL;
 	u8 send_data[6];
 	u8 *read_data_top = data;
@@ -64,7 +64,7 @@ static int cxd2880_io_spi_write_reg(struct cxd2880_io *io,
 				    u8 sub_address,
 				    const u8 *data, u32 size)
 {
-	int ret;
+	int ret = 0;
 	struct cxd2880_spi *spi = NULL;
 	u8 send_data[BURST_WRITE_MAX + 4];
 	const u8 *write_data_top = data;
diff --git a/drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd.c b/drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd.c
index 25851bbb846e..4cf2d7cfd3f5 100644
--- a/drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd.c
+++ b/drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd.c
@@ -2503,7 +2503,7 @@ int cxd2880_tnrdmd_set_cfg(struct cxd2880_tnrdmd *tnr_dmd,
 			   enum cxd2880_tnrdmd_cfg_id id,
 			   int value)
 {
-	int ret;
+	int ret = 0;
 	u8 data[2] = { 0 };
 	u8 need_sub_setting = 0;
 
-- 
2.14.3

[PATCH 3/3] media: cxd2880: remove unused vars

[Mauro Carvalho Chehab]

drivers/media/dvb-frontends/cxd2880/cxd2880_top.c: In function ‘cxd2880_set_ber_per_period_t’:
drivers/media/dvb-frontends/cxd2880/cxd2880_top.c:677:34: warning: variable ‘c’ set but not used [-Wunused-but-set-variable]
  struct dtv_frontend_properties *c;
                                  ^
drivers/media/dvb-frontends/cxd2880/cxd2880_top.c: In function ‘cxd2880_set_ber_per_period_t2’:
drivers/media/dvb-frontends/cxd2880/cxd2880_top.c:790:34: warning: variable ‘c’ set but not used [-Wunused-but-set-variable]
  struct dtv_frontend_properties *c;
                                  ^
drivers/media/dvb-frontends/cxd2880/cxd2880_top.c: In function ‘cxd2880_get_frontend’:
drivers/media/dvb-frontends/cxd2880/cxd2880_top.c:1799:23: warning: variable ‘priv’ set but not used [-Wunused-but-set-variable]
  struct cxd2880_priv *priv = NULL;
                       ^~~~

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---
 drivers/media/dvb-frontends/cxd2880/cxd2880_top.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/media/dvb-frontends/cxd2880/cxd2880_top.c b/drivers/media/dvb-frontends/cxd2880/cxd2880_top.c
index 05360a11bea9..d474dc1b05da 100644
--- a/drivers/media/dvb-frontends/cxd2880/cxd2880_top.c
+++ b/drivers/media/dvb-frontends/cxd2880/cxd2880_top.c
@@ -674,7 +674,6 @@ static int cxd2880_read_ber(struct dvb_frontend *fe, u32 *ber)
 static int cxd2880_set_ber_per_period_t(struct dvb_frontend *fe)
 {
 	int ret;
-	struct dtv_frontend_properties *c;
 	struct cxd2880_priv *priv;
 	struct cxd2880_dvbt_tpsinfo info;
 	enum cxd2880_dtv_bandwidth bw = CXD2880_DTV_BW_1_7_MHZ;
@@ -691,7 +690,6 @@ static int cxd2880_set_ber_per_period_t(struct dvb_frontend *fe)
 	}
 
 	priv = fe->demodulator_priv;
-	c = &fe->dtv_property_cache;
 	bw = priv->dvbt_tune_param.bandwidth;
 
 	ret = cxd2880_tnrdmd_dvbt_mon_tps_info(&priv->tnrdmd,
@@ -787,7 +785,6 @@ static int cxd2880_set_ber_per_period_t(struct dvb_frontend *fe)
 static int cxd2880_set_ber_per_period_t2(struct dvb_frontend *fe)
 {
 	int ret;
-	struct dtv_frontend_properties *c;
 	struct cxd2880_priv *priv;
 	struct cxd2880_dvbt2_l1pre l1pre;
 	struct cxd2880_dvbt2_l1post l1post;
@@ -815,7 +812,6 @@ static int cxd2880_set_ber_per_period_t2(struct dvb_frontend *fe)
 	}
 
 	priv = fe->demodulator_priv;
-	c = &fe->dtv_property_cache;
 	bw = priv->dvbt2_tune_param.bandwidth;
 
 	ret = cxd2880_tnrdmd_dvbt2_mon_l1_pre(&priv->tnrdmd, &l1pre);
@@ -1796,7 +1792,6 @@ static int cxd2880_get_frontend_t2(struct dvb_frontend *fe,
 static int cxd2880_get_frontend(struct dvb_frontend *fe,
 				struct dtv_frontend_properties *props)
 {
-	struct cxd2880_priv *priv = NULL;
 	int ret;
 
 	if (!fe || !props) {
@@ -1804,8 +1799,6 @@ static int cxd2880_get_frontend(struct dvb_frontend *fe,
 		return -EINVAL;
 	}
 
-	priv = fe->demodulator_priv;
-
 	pr_debug("system=%d\n", fe->dtv_property_cache.delivery_system);
 	switch (fe->dtv_property_cache.delivery_system) {
 	case SYS_DVBT:
-- 
2.14.3