Commit 7fd85371 authored by Tom Rix's avatar Tom Rix Committed by Mauro Carvalho Chehab
Browse files

media: remove unneeded break 



A break is not needed if it is preceded by a return

Signed-off-by: default avatarTom Rix <trix@redhat.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent b14e7b66

drivers/media/dvb-frontends/drx39xyj/drxj.c

+0 −7
Original line number Diff line number Diff line
@@ -2325,7 +2325,6 @@ hi_command(struct i2c_device_addr *dev_addr, const struct drxj_hi_cmd *cmd, u16 


	default:

		return -EINVAL;

		break;

	}



	/* Write command */
@@ -3594,7 +3593,6 @@ static int ctrl_set_uio_cfg(struct drx_demod_instance *demod, struct drxuio_cfg 
			break;

		default:

			return -EINVAL;

			break;

		}		/* switch ( uio_cfg->mode ) */

		break;

      /*====================================================================*/
@@ -3618,7 +3616,6 @@ static int ctrl_set_uio_cfg(struct drx_demod_instance *demod, struct drxuio_cfg 
			break;

		default:

			return -EINVAL;

			break;

		}		/* switch ( uio_cfg->mode ) */

		break;

      /*====================================================================*/
@@ -3642,7 +3639,6 @@ static int ctrl_set_uio_cfg(struct drx_demod_instance *demod, struct drxuio_cfg 
		case DRX_UIO_MODE_FIRMWARE0:

		default:

			return -EINVAL;

			break;

		}		/* switch ( uio_cfg->mode ) */

		break;

      /*====================================================================*/
@@ -10953,7 +10949,6 @@ ctrl_set_standard(struct drx_demod_instance *demod, enum drx_standard *standard) 
	default:

		ext_attr->standard = DRX_STANDARD_UNKNOWN;

		return -EINVAL;

		break;

	}



	return 0;
@@ -11074,7 +11069,6 @@ ctrl_power_mode(struct drx_demod_instance *demod, enum drx_power_mode *mode) 
	default:

		/* Unknow sleep mode */

		return -EINVAL;

		break;

	}



	/* Check if device needs to be powered up */
@@ -11896,7 +11890,6 @@ static int drx_ctrl_u_code(struct drx_demod_instance *demod, 
		}

		default:

			return -EINVAL;

			break;



		}

		mc_data += mc_block_nr_bytes;

drivers/media/dvb-frontends/drxd_hard.c

+0 −1
Original line number Diff line number Diff line
@@ -1622,7 +1622,6 @@ static int CorrectSysClockDeviation(struct drxd_state *state) 
			break;

		default:

			return -1;

			break;

		}



		/* Compute new sysclock value

drivers/media/dvb-frontends/nxt200x.c

+0 −16
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ static int nxt200x_writereg_multibyte (struct nxt200x_state* state, u8 reg, u8* 
			break;

		default:

			return -EINVAL;

			break;

	}



	/* set multi register length */
@@ -190,7 +189,6 @@ static int nxt200x_writereg_multibyte (struct nxt200x_state* state, u8 reg, u8* 
			break;

		default:

			return -EINVAL;

			break;

	}



	pr_warn("Error writing multireg register 0x%02X\n", reg);
@@ -216,7 +214,6 @@ static int nxt200x_readreg_multibyte (struct nxt200x_state* state, u8 reg, u8* d 
			/* read the actual data */

			nxt200x_readbytes(state, reg, data, len);

			return 0;

			break;

		case NXT2004:

			/* probably not right, but gives correct values */

			attr = 0x02;
@@ -239,10 +236,8 @@ static int nxt200x_readreg_multibyte (struct nxt200x_state* state, u8 reg, u8* d 
				nxt200x_readbytes(state, 0x36 + i, &data[i], 1);

			}

			return 0;

			break;

		default:

			return -EINVAL;

			break;

	}

}
@@ -374,7 +369,6 @@ static int nxt200x_writetuner (struct nxt200x_state* state, u8* data) 
			break;

		default:

			return -EINVAL;

			break;

	}

	return 0;

}
@@ -555,7 +549,6 @@ static int nxt200x_setup_frontend_parameters(struct dvb_frontend *fe) 
			break;

		default:

			return -EINVAL;

			break;

	}



	if (fe->ops.tuner_ops.calc_regs) {
@@ -580,7 +573,6 @@ static int nxt200x_setup_frontend_parameters(struct dvb_frontend *fe) 
			break;

		default:

			return -EINVAL;

			break;

	}

	nxt200x_writebytes(state, 0x42, buf, 1);
@@ -594,7 +586,6 @@ static int nxt200x_setup_frontend_parameters(struct dvb_frontend *fe) 
			break;

		default:

			return -EINVAL;

			break;

	}

	nxt200x_writebytes(state, 0x57, buf, 1);
@@ -610,7 +601,6 @@ static int nxt200x_setup_frontend_parameters(struct dvb_frontend *fe) 
			break;

		default:

			return -EINVAL;

			break;

	}



	/* write sdmx input */
@@ -626,7 +616,6 @@ static int nxt200x_setup_frontend_parameters(struct dvb_frontend *fe) 
				break;

		default:

				return -EINVAL;

				break;

	}

	buf[1] = 0x00;

	switch (state->demod_chip) {
@@ -638,7 +627,6 @@ static int nxt200x_setup_frontend_parameters(struct dvb_frontend *fe) 
			break;

		default:

			return -EINVAL;

			break;

	}



	/* write adc power lpf fc */
@@ -664,7 +652,6 @@ static int nxt200x_setup_frontend_parameters(struct dvb_frontend *fe) 
			break;

		default:

			return -EINVAL;

			break;

	}



	/* write kg1 */
@@ -720,7 +707,6 @@ static int nxt200x_setup_frontend_parameters(struct dvb_frontend *fe) 
				break;

		default:

				return -EINVAL;

				break;

	}

	nxt200x_writebytes(state, 0x30, buf, 1);
@@ -742,7 +728,6 @@ static int nxt200x_setup_frontend_parameters(struct dvb_frontend *fe) 
			break;

		default:

			return -EINVAL;

			break;

	}



	/* write agc control reg */
@@ -1114,7 +1099,6 @@ static int nxt200x_init(struct dvb_frontend* fe) 
				break;

			default:

				return -EINVAL;

				break;

		}

		state->initialised = 1;

	}

drivers/media/dvb-frontends/si21xx.c

+0 −2
Original line number Diff line number Diff line
@@ -464,10 +464,8 @@ static int si21xx_set_voltage(struct dvb_frontend *fe, enum fe_sec_voltage volt) 
	switch (volt) {

	case SEC_VOLTAGE_18:

		return si21_writereg(state, LNB_CTRL_REG_1, val | 0x40);

		break;

	case SEC_VOLTAGE_13:

		return si21_writereg(state, LNB_CTRL_REG_1, (val & ~0x40));

		break;

	default:

		return -EINVAL;

	}

drivers/media/tuners/mt2063.c

+0 −1
Original line number Diff line number Diff line
@@ -1849,7 +1849,6 @@ static int mt2063_init(struct dvb_frontend *fe) 


	default:

		return -ENODEV;

		break;

	}



	while (status >= 0 && *def) {