diff mbox series

[05/20] media: drxk: drop operation_mode from set_dvbt()

Message ID 1a2a3fa651a90bd1e4d00318d67bfe0488e98df2.1637781097.git.mchehab+huawei@kernel.org (mailing list archive)
State New, archived
Headers show
Series Solve the remaining issues with clang and W=1 on media | expand

Commit Message

Mauro Carvalho Chehab Nov. 24, 2021, 7:13 p.m. UTC 
This var is set, but never used. So, drop it.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH 00/20] at: https://lore.kernel.org/all/cover.1637781097.git.mchehab+huawei@kernel.org/

 drivers/media/dvb-frontends/drxk_hard.c | 6 ------
 1 file changed, 6 deletions(-)

Comments

Nathan Chancellor Nov. 26, 2021, 7:02 p.m. UTC | #1 
On Wed, Nov 24, 2021 at 08:13:08PM +0100, Mauro Carvalho Chehab wrote:
> This var is set, but never used. So, drop it.
> 
> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
> ---
> 
> To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
> See [PATCH 00/20] at: https://lore.kernel.org/all/cover.1637781097.git.mchehab+huawei@kernel.org/
> 
>  drivers/media/dvb-frontends/drxk_hard.c | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/drivers/media/dvb-frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c
> index d7fc2595f15b..afa0ac85313f 100644
> --- a/drivers/media/dvb-frontends/drxk_hard.c
> +++ b/drivers/media/dvb-frontends/drxk_hard.c
> @@ -3720,7 +3720,6 @@ static int set_dvbt(struct drxk_state *state, u16 intermediate_freqk_hz,
>  {
>  	u16 cmd_result = 0;
>  	u16 transmission_params = 0;
> -	u16 operation_mode = 0;
>  	u32 iqm_rc_rate_ofs = 0;
>  	u32 bandwidth = 0;
>  	u16 param1;
> @@ -3760,7 +3759,6 @@ static int set_dvbt(struct drxk_state *state, u16 intermediate_freqk_hz,
>  	switch (state->props.transmission_mode) {
>  	case TRANSMISSION_MODE_AUTO:
>  	default:
> -		operation_mode |= OFDM_SC_RA_RAM_OP_AUTO_MODE__M;
>  		fallthrough;	/* try first guess DRX_FFTMODE_8K */

I think that all these fallthrough annotations in these blocks are
useless now and can be eliminated, as the block contains no code to
fallthrough on.

>  	case TRANSMISSION_MODE_8K:
>  		transmission_params |= OFDM_SC_RA_RAM_OP_PARAM_MODE_8K;
> @@ -3774,7 +3772,6 @@ static int set_dvbt(struct drxk_state *state, u16 intermediate_freqk_hz,
>  	switch (state->props.guard_interval) {
>  	default:
>  	case GUARD_INTERVAL_AUTO:
> -		operation_mode |= OFDM_SC_RA_RAM_OP_AUTO_GUARD__M;
>  		fallthrough;	/* try first guess DRX_GUARD_1DIV4 */
>  	case GUARD_INTERVAL_1_4:
>  		transmission_params |= OFDM_SC_RA_RAM_OP_PARAM_GUARD_4;
> @@ -3795,7 +3792,6 @@ static int set_dvbt(struct drxk_state *state, u16 intermediate_freqk_hz,
>  	case HIERARCHY_AUTO:
>  	case HIERARCHY_NONE:
>  	default:
> -		operation_mode |= OFDM_SC_RA_RAM_OP_AUTO_HIER__M;
>  		/* try first guess SC_RA_RAM_OP_PARAM_HIER_NO */
>  		/* transmission_params |= OFDM_SC_RA_RAM_OP_PARAM_HIER_NO; */
>  		fallthrough;
> @@ -3815,7 +3811,6 @@ static int set_dvbt(struct drxk_state *state, u16 intermediate_freqk_hz,
>  	switch (state->props.modulation) {
>  	case QAM_AUTO:
>  	default:
> -		operation_mode |= OFDM_SC_RA_RAM_OP_AUTO_CONST__M;
>  		fallthrough;	/* try first guess DRX_CONSTELLATION_QAM64 */
>  	case QAM_64:
>  		transmission_params |= OFDM_SC_RA_RAM_OP_PARAM_CONST_QAM64;
> @@ -3858,7 +3853,6 @@ static int set_dvbt(struct drxk_state *state, u16 intermediate_freqk_hz,
>  	switch (state->props.code_rate_HP) {
>  	case FEC_AUTO:
>  	default:
> -		operation_mode |= OFDM_SC_RA_RAM_OP_AUTO_RATE__M;
>  		fallthrough;	/* try first guess DRX_CODERATE_2DIV3 */
>  	case FEC_2_3:
>  		transmission_params |= OFDM_SC_RA_RAM_OP_PARAM_RATE_2_3;
> -- 
> 2.33.1
> 
>
diff mbox series

Patch

diff --git a/drivers/media/dvb-frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c
index d7fc2595f15b..afa0ac85313f 100644
--- a/drivers/media/dvb-frontends/drxk_hard.c
+++ b/drivers/media/dvb-frontends/drxk_hard.c
@@ -3720,7 +3720,6 @@  static int set_dvbt(struct drxk_state *state, u16 intermediate_freqk_hz,
 {
 	u16 cmd_result = 0;
 	u16 transmission_params = 0;
-	u16 operation_mode = 0;
 	u32 iqm_rc_rate_ofs = 0;
 	u32 bandwidth = 0;
 	u16 param1;
@@ -3760,7 +3759,6 @@  static int set_dvbt(struct drxk_state *state, u16 intermediate_freqk_hz,
 	switch (state->props.transmission_mode) {
 	case TRANSMISSION_MODE_AUTO:
 	default:
-		operation_mode |= OFDM_SC_RA_RAM_OP_AUTO_MODE__M;
 		fallthrough;	/* try first guess DRX_FFTMODE_8K */
 	case TRANSMISSION_MODE_8K:
 		transmission_params |= OFDM_SC_RA_RAM_OP_PARAM_MODE_8K;
@@ -3774,7 +3772,6 @@  static int set_dvbt(struct drxk_state *state, u16 intermediate_freqk_hz,
 	switch (state->props.guard_interval) {
 	default:
 	case GUARD_INTERVAL_AUTO:
-		operation_mode |= OFDM_SC_RA_RAM_OP_AUTO_GUARD__M;
 		fallthrough;	/* try first guess DRX_GUARD_1DIV4 */
 	case GUARD_INTERVAL_1_4:
 		transmission_params |= OFDM_SC_RA_RAM_OP_PARAM_GUARD_4;
@@ -3795,7 +3792,6 @@  static int set_dvbt(struct drxk_state *state, u16 intermediate_freqk_hz,
 	case HIERARCHY_AUTO:
 	case HIERARCHY_NONE:
 	default:
-		operation_mode |= OFDM_SC_RA_RAM_OP_AUTO_HIER__M;
 		/* try first guess SC_RA_RAM_OP_PARAM_HIER_NO */
 		/* transmission_params |= OFDM_SC_RA_RAM_OP_PARAM_HIER_NO; */
 		fallthrough;
@@ -3815,7 +3811,6 @@  static int set_dvbt(struct drxk_state *state, u16 intermediate_freqk_hz,
 	switch (state->props.modulation) {
 	case QAM_AUTO:
 	default:
-		operation_mode |= OFDM_SC_RA_RAM_OP_AUTO_CONST__M;
 		fallthrough;	/* try first guess DRX_CONSTELLATION_QAM64 */
 	case QAM_64:
 		transmission_params |= OFDM_SC_RA_RAM_OP_PARAM_CONST_QAM64;
@@ -3858,7 +3853,6 @@  static int set_dvbt(struct drxk_state *state, u16 intermediate_freqk_hz,
 	switch (state->props.code_rate_HP) {
 	case FEC_AUTO:
 	default:
-		operation_mode |= OFDM_SC_RA_RAM_OP_AUTO_RATE__M;
 		fallthrough;	/* try first guess DRX_CODERATE_2DIV3 */
 	case FEC_2_3:
 		transmission_params |= OFDM_SC_RA_RAM_OP_PARAM_RATE_2_3;