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

Commit 8908c049 authored by Philippe Langlais's avatar Philippe Langlais Committed by Lee Jones
Browse files

mfd: ab8500-gpadc: Use new ab8500_gpadc_get() with name parameter 



The new format of ab8500_gpadc_get() accepts a device name as a
parameter to specify which device to retrieve. This patch
enforces the use of that new format.

Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarPhilippe Langlais <philippe.langlais@linaro.org>
parent 9d3f653f

drivers/mfd/ab8500-debugfs.c

+13 −13
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ static int ab8500_gpadc_bat_ctrl_print(struct seq_file *s, void *p) 
	int bat_ctrl_convert;

	struct ab8500_gpadc *gpadc;



	gpadc = ab8500_gpadc_get();

	gpadc = ab8500_gpadc_get("ab8500-gpadc.0");

	bat_ctrl_raw = ab8500_gpadc_read_raw(gpadc, BAT_CTRL);

	bat_ctrl_convert = ab8500_gpadc_ad_to_voltage(gpadc,

			BAT_CTRL, bat_ctrl_raw);
@@ -834,7 +834,7 @@ static int ab8500_gpadc_btemp_ball_print(struct seq_file *s, void *p) 
	int btemp_ball_convert;

	struct ab8500_gpadc *gpadc;



	gpadc = ab8500_gpadc_get();

	gpadc = ab8500_gpadc_get("ab8500-gpadc.0");

	btemp_ball_raw = ab8500_gpadc_read_raw(gpadc, BTEMP_BALL);

	btemp_ball_convert = ab8500_gpadc_ad_to_voltage(gpadc, BTEMP_BALL,

			btemp_ball_raw);
@@ -863,7 +863,7 @@ static int ab8500_gpadc_main_charger_v_print(struct seq_file *s, void *p) 
	int main_charger_v_convert;

	struct ab8500_gpadc *gpadc;



	gpadc = ab8500_gpadc_get();

	gpadc = ab8500_gpadc_get("ab8500-gpadc.0");

	main_charger_v_raw = ab8500_gpadc_read_raw(gpadc, MAIN_CHARGER_V);

	main_charger_v_convert = ab8500_gpadc_ad_to_voltage(gpadc,

			MAIN_CHARGER_V, main_charger_v_raw);
@@ -893,7 +893,7 @@ static int ab8500_gpadc_acc_detect1_print(struct seq_file *s, void *p) 
	int acc_detect1_convert;

	struct ab8500_gpadc *gpadc;



	gpadc = ab8500_gpadc_get();

	gpadc = ab8500_gpadc_get("ab8500-gpadc.0");

	acc_detect1_raw = ab8500_gpadc_read_raw(gpadc, ACC_DETECT1);

	acc_detect1_convert = ab8500_gpadc_ad_to_voltage(gpadc, ACC_DETECT1,

			acc_detect1_raw);
@@ -923,7 +923,7 @@ static int ab8500_gpadc_acc_detect2_print(struct seq_file *s, void *p) 
	int acc_detect2_convert;

	struct ab8500_gpadc *gpadc;



	gpadc = ab8500_gpadc_get();

	gpadc = ab8500_gpadc_get("ab8500-gpadc.0");

	acc_detect2_raw = ab8500_gpadc_read_raw(gpadc, ACC_DETECT2);

	acc_detect2_convert = ab8500_gpadc_ad_to_voltage(gpadc,

	    ACC_DETECT2, acc_detect2_raw);
@@ -953,7 +953,7 @@ static int ab8500_gpadc_aux1_print(struct seq_file *s, void *p) 
	int aux1_convert;

	struct ab8500_gpadc *gpadc;



	gpadc = ab8500_gpadc_get();

	gpadc = ab8500_gpadc_get("ab8500-gpadc.0");

	aux1_raw = ab8500_gpadc_read_raw(gpadc, ADC_AUX1);

	aux1_convert = ab8500_gpadc_ad_to_voltage(gpadc, ADC_AUX1,

			aux1_raw);
@@ -981,7 +981,7 @@ static int ab8500_gpadc_aux2_print(struct seq_file *s, void *p) 
	int aux2_convert;

	struct ab8500_gpadc *gpadc;



	gpadc = ab8500_gpadc_get();

	gpadc = ab8500_gpadc_get("ab8500-gpadc.0");

	aux2_raw = ab8500_gpadc_read_raw(gpadc, ADC_AUX2);

	aux2_convert = ab8500_gpadc_ad_to_voltage(gpadc, ADC_AUX2,

			aux2_raw);
@@ -1009,7 +1009,7 @@ static int ab8500_gpadc_main_bat_v_print(struct seq_file *s, void *p) 
	int main_bat_v_convert;

	struct ab8500_gpadc *gpadc;



	gpadc = ab8500_gpadc_get();

	gpadc = ab8500_gpadc_get("ab8500-gpadc.0");

	main_bat_v_raw = ab8500_gpadc_read_raw(gpadc, MAIN_BAT_V);

	main_bat_v_convert = ab8500_gpadc_ad_to_voltage(gpadc, MAIN_BAT_V,

			main_bat_v_raw);
@@ -1038,7 +1038,7 @@ static int ab8500_gpadc_vbus_v_print(struct seq_file *s, void *p) 
	int vbus_v_convert;

	struct ab8500_gpadc *gpadc;



	gpadc = ab8500_gpadc_get();

	gpadc = ab8500_gpadc_get("ab8500-gpadc.0");

	vbus_v_raw = ab8500_gpadc_read_raw(gpadc, VBUS_V);

	vbus_v_convert = ab8500_gpadc_ad_to_voltage(gpadc, VBUS_V,

			vbus_v_raw);
@@ -1066,7 +1066,7 @@ static int ab8500_gpadc_main_charger_c_print(struct seq_file *s, void *p) 
	int main_charger_c_convert;

	struct ab8500_gpadc *gpadc;



	gpadc = ab8500_gpadc_get();

	gpadc = ab8500_gpadc_get("ab8500-gpadc.0");

	main_charger_c_raw = ab8500_gpadc_read_raw(gpadc, MAIN_CHARGER_C);

	main_charger_c_convert = ab8500_gpadc_ad_to_voltage(gpadc,

			MAIN_CHARGER_C, main_charger_c_raw);
@@ -1096,7 +1096,7 @@ static int ab8500_gpadc_usb_charger_c_print(struct seq_file *s, void *p) 
	int usb_charger_c_convert;

	struct ab8500_gpadc *gpadc;



	gpadc = ab8500_gpadc_get();

	gpadc = ab8500_gpadc_get("ab8500-gpadc.0");

	usb_charger_c_raw = ab8500_gpadc_read_raw(gpadc, USB_CHARGER_C);

	usb_charger_c_convert = ab8500_gpadc_ad_to_voltage(gpadc,

	    USB_CHARGER_C, usb_charger_c_raw);
@@ -1126,7 +1126,7 @@ static int ab8500_gpadc_bk_bat_v_print(struct seq_file *s, void *p) 
	int bk_bat_v_convert;

	struct ab8500_gpadc *gpadc;



	gpadc = ab8500_gpadc_get();

	gpadc = ab8500_gpadc_get("ab8500-gpadc.0");

	bk_bat_v_raw = ab8500_gpadc_read_raw(gpadc, BK_BAT_V);

	bk_bat_v_convert = ab8500_gpadc_ad_to_voltage(gpadc,

			BK_BAT_V, bk_bat_v_raw);
@@ -1154,7 +1154,7 @@ static int ab8500_gpadc_die_temp_print(struct seq_file *s, void *p) 
	int die_temp_convert;

	struct ab8500_gpadc *gpadc;



	gpadc = ab8500_gpadc_get();

	gpadc = ab8500_gpadc_get("ab8500-gpadc.0");

	die_temp_raw = ab8500_gpadc_read_raw(gpadc, DIE_TEMP);

	die_temp_convert = ab8500_gpadc_ad_to_voltage(gpadc, DIE_TEMP,

			die_temp_raw);