Skip to content

Commit 9c7a87f

Browse files
bzolnierEduardo Valentin
authored andcommitted
thermal: exynos: remove redundant pdata checks from exynos_tmu_control()
pdata->reference_voltage and pdata->gain are always defined to non-zero values so remove the redundant checks from exynos_tmu_control(). There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]> Acked-by: Kyungmin Park <[email protected]> Tested-by: Amit Daniel Kachhap <[email protected]> Signed-off-by: Eduardo Valentin <[email protected]>
1 parent ac951af commit 9c7a87f

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

drivers/thermal/samsung/exynos_tmu.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -274,15 +274,11 @@ static void exynos_tmu_control(struct platform_device *pdev, bool on)
274274
if (pdata->test_mux)
275275
con |= (pdata->test_mux << reg->test_mux_addr_shift);
276276

277-
if (pdata->reference_voltage) {
278-
con &= ~(reg->buf_vref_sel_mask << reg->buf_vref_sel_shift);
279-
con |= pdata->reference_voltage << reg->buf_vref_sel_shift;
280-
}
277+
con &= ~(reg->buf_vref_sel_mask << reg->buf_vref_sel_shift);
278+
con |= pdata->reference_voltage << reg->buf_vref_sel_shift;
281279

282-
if (pdata->gain) {
283-
con &= ~(reg->buf_slope_sel_mask << reg->buf_slope_sel_shift);
284-
con |= (pdata->gain << reg->buf_slope_sel_shift);
285-
}
280+
con &= ~(reg->buf_slope_sel_mask << reg->buf_slope_sel_shift);
281+
con |= (pdata->gain << reg->buf_slope_sel_shift);
286282

287283
if (pdata->noise_cancel_mode) {
288284
con &= ~(reg->therm_trip_mode_mask <<

drivers/thermal/samsung/exynos_tmu.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,10 @@ struct exynos_tmu_registers {
201201
* @max_trigger_level: max trigger level supported by the TMU
202202
* @non_hw_trigger_levels: number of defined non-hardware trigger levels
203203
* @gain: gain of amplifier in the positive-TC generator block
204-
* 0 <= gain <= 15
204+
* 0 < gain <= 15
205205
* @reference_voltage: reference voltage of amplifier
206206
* in the positive-TC generator block
207-
* 0 <= reference_voltage <= 31
207+
* 0 < reference_voltage <= 31
208208
* @noise_cancel_mode: noise cancellation mode
209209
* 000, 100, 101, 110 and 111 can be different modes
210210
* @type: determines the type of SOC

0 commit comments

Comments
 (0)