Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbecb499 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "thermal: tsens: Update function return type"

parents 1f1b9dc4 82403086

drivers/thermal/tsens-mtc.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -30,7 +30,7 @@ struct tsens_device *tsens_controller_is_present(void) 
}

EXPORT_SYMBOL(tsens_controller_is_present);



static int tsens_mtc_reset_history_counter(unsigned int zone)

int tsens_mtc_reset_history_counter(unsigned int zone)

{

	unsigned int reg_cntl, is_valid;

	void __iomem *sensor_addr;

drivers/thermal/tsens-mtc.h

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -57,3 +57,4 @@ extern struct tsens_device *tsens_controller_is_present(void); 
extern int tsens_set_mtc_zone_sw_mask(unsigned int zone,

			unsigned int th1_enable, unsigned int th2_enable);

extern int tsens_get_mtc_zone_log(unsigned int zone, void *zone_log);

extern int tsens_mtc_reset_history_counter(unsigned int zone);