tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ab8500_btemp: Get rid of 'enum adc_therm'

Browse Source 
This is the same as abx500_adc_therm, but when the former is used,
the following warning flood pops up:

drivers/power/ab8500_btemp.c: In function 'ab8500_btemp_batctrl_volt_to_res':
ab8500_btemp.c:150:25: warning: comparison between 'enum abx500_adc_therm' and 'enum adc_therm' [-Wenum-compare]
ab8500_btemp.c: In function 'ab8500_btemp_curr_source_enable':
ab8500_btemp.c:212:25: warning: comparison between 'enum abx500_adc_therm' and 'enum adc_therm' [-Wenum-compare]
ab8500_btemp.c:244:32: warning: comparison between 'enum abx500_adc_therm' and 'enum adc_therm' [-Wenum-compare]
ab8500_btemp.c: In function 'ab8500_btemp_measure_temp':
ab8500_btemp.c:462:25: warning: comparison between 'enum abx500_adc_therm' and 'enum adc_therm' [-Wenum-compare]
ab8500_btemp.c: In function 'ab8500_btemp_id':
ab8500_btemp.c:528:121: warning: comparison between 'enum abx500_adc_therm' and 'enum adc_therm' [-Wenum-compare]
ab8500_btemp.c:551:25: warning: comparison between 'enum abx500_adc_therm' and 'enum adc_therm' [-Wenum-compare]

This patch fixes the issue by switching the driver to use more
namespace-friendly enum.

Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
This commit is contained in:
Anton Vorontsov
2012-03-14 04:27:20 +04:00
parent efd71c89a4
commit d329129e9e
2 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/mfd/abx500/ab8500-bm.h
+2 -13
View File
@@ -9,6 +9,7 @@
#define _AB8500_BM_H
#include <linux/kernel.h>
#include <linux/mfd/abx500.h>
/*
* System control 2 register offsets.
@@ -231,18 +232,6 @@
/* Battery type */
#define BATTERY_UNKNOWN 00
/*
* ADC for the battery thermistor.
* When using the ADC_THERM_BATCTRL the battery ID resistor is combined with
* a NTC resistor to both identify the battery and to measure its temperature.
* Different phone manufactures uses different techniques to both identify the
* battery and to read its temperature.
*/
enum adc_therm {
ADC_THERM_BATCTRL,
ADC_THERM_BATTEMP,
};
/**
* struct res_to_temp - defines one point in a temp to res curve. To
* be used in battery packs that combines the identification resistor with a
@@ -464,7 +453,7 @@ struct ab8500_bm_data {
bool no_maintenance;
bool chg_unknown_bat;
bool enable_overshoot;
enum adc_therm adc_therm;
enum abx500_adc_therm adc_therm;
int fg_res;
int n_btypes;
int batt_id;