diff options
author | Philippe Langlais <philippe.langlais@linaro.org> | 2012-04-18 09:52:59 -0400 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2013-02-04 03:33:30 -0500 |
commit | 8908c04985ed67b9138c6e06be2c81867f24e2d4 (patch) | |
tree | ae90d5a38ddc2802fbb566d41cf7e489da4fae22 /drivers/mfd | |
parent | 9d3f653f45b0ad299158d31207e4b747aa6df2c7 (diff) |
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: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/ab8500-debugfs.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c index b3fb65354567..ba25f95e1677 100644 --- a/drivers/mfd/ab8500-debugfs.c +++ b/drivers/mfd/ab8500-debugfs.c | |||
@@ -806,7 +806,7 @@ static int ab8500_gpadc_bat_ctrl_print(struct seq_file *s, void *p) | |||
806 | int bat_ctrl_convert; | 806 | int bat_ctrl_convert; |
807 | struct ab8500_gpadc *gpadc; | 807 | struct ab8500_gpadc *gpadc; |
808 | 808 | ||
809 | gpadc = ab8500_gpadc_get(); | 809 | gpadc = ab8500_gpadc_get("ab8500-gpadc.0"); |
810 | bat_ctrl_raw = ab8500_gpadc_read_raw(gpadc, BAT_CTRL); | 810 | bat_ctrl_raw = ab8500_gpadc_read_raw(gpadc, BAT_CTRL); |
811 | bat_ctrl_convert = ab8500_gpadc_ad_to_voltage(gpadc, | 811 | bat_ctrl_convert = ab8500_gpadc_ad_to_voltage(gpadc, |
812 | BAT_CTRL, bat_ctrl_raw); | 812 | BAT_CTRL, bat_ctrl_raw); |
@@ -834,7 +834,7 @@ static int ab8500_gpadc_btemp_ball_print(struct seq_file *s, void *p) | |||
834 | int btemp_ball_convert; | 834 | int btemp_ball_convert; |
835 | struct ab8500_gpadc *gpadc; | 835 | struct ab8500_gpadc *gpadc; |
836 | 836 | ||
837 | gpadc = ab8500_gpadc_get(); | 837 | gpadc = ab8500_gpadc_get("ab8500-gpadc.0"); |
838 | btemp_ball_raw = ab8500_gpadc_read_raw(gpadc, BTEMP_BALL); | 838 | btemp_ball_raw = ab8500_gpadc_read_raw(gpadc, BTEMP_BALL); |
839 | btemp_ball_convert = ab8500_gpadc_ad_to_voltage(gpadc, BTEMP_BALL, | 839 | btemp_ball_convert = ab8500_gpadc_ad_to_voltage(gpadc, BTEMP_BALL, |
840 | btemp_ball_raw); | 840 | btemp_ball_raw); |
@@ -863,7 +863,7 @@ static int ab8500_gpadc_main_charger_v_print(struct seq_file *s, void *p) | |||
863 | int main_charger_v_convert; | 863 | int main_charger_v_convert; |
864 | struct ab8500_gpadc *gpadc; | 864 | struct ab8500_gpadc *gpadc; |
865 | 865 | ||
866 | gpadc = ab8500_gpadc_get(); | 866 | gpadc = ab8500_gpadc_get("ab8500-gpadc.0"); |
867 | main_charger_v_raw = ab8500_gpadc_read_raw(gpadc, MAIN_CHARGER_V); | 867 | main_charger_v_raw = ab8500_gpadc_read_raw(gpadc, MAIN_CHARGER_V); |
868 | main_charger_v_convert = ab8500_gpadc_ad_to_voltage(gpadc, | 868 | main_charger_v_convert = ab8500_gpadc_ad_to_voltage(gpadc, |
869 | MAIN_CHARGER_V, main_charger_v_raw); | 869 | MAIN_CHARGER_V, main_charger_v_raw); |
@@ -893,7 +893,7 @@ static int ab8500_gpadc_acc_detect1_print(struct seq_file *s, void *p) | |||
893 | int acc_detect1_convert; | 893 | int acc_detect1_convert; |
894 | struct ab8500_gpadc *gpadc; | 894 | struct ab8500_gpadc *gpadc; |
895 | 895 | ||
896 | gpadc = ab8500_gpadc_get(); | 896 | gpadc = ab8500_gpadc_get("ab8500-gpadc.0"); |
897 | acc_detect1_raw = ab8500_gpadc_read_raw(gpadc, ACC_DETECT1); | 897 | acc_detect1_raw = ab8500_gpadc_read_raw(gpadc, ACC_DETECT1); |
898 | acc_detect1_convert = ab8500_gpadc_ad_to_voltage(gpadc, ACC_DETECT1, | 898 | acc_detect1_convert = ab8500_gpadc_ad_to_voltage(gpadc, ACC_DETECT1, |
899 | acc_detect1_raw); | 899 | acc_detect1_raw); |
@@ -923,7 +923,7 @@ static int ab8500_gpadc_acc_detect2_print(struct seq_file *s, void *p) | |||
923 | int acc_detect2_convert; | 923 | int acc_detect2_convert; |
924 | struct ab8500_gpadc *gpadc; | 924 | struct ab8500_gpadc *gpadc; |
925 | 925 | ||
926 | gpadc = ab8500_gpadc_get(); | 926 | gpadc = ab8500_gpadc_get("ab8500-gpadc.0"); |
927 | acc_detect2_raw = ab8500_gpadc_read_raw(gpadc, ACC_DETECT2); | 927 | acc_detect2_raw = ab8500_gpadc_read_raw(gpadc, ACC_DETECT2); |
928 | acc_detect2_convert = ab8500_gpadc_ad_to_voltage(gpadc, | 928 | acc_detect2_convert = ab8500_gpadc_ad_to_voltage(gpadc, |
929 | ACC_DETECT2, acc_detect2_raw); | 929 | ACC_DETECT2, acc_detect2_raw); |
@@ -953,7 +953,7 @@ static int ab8500_gpadc_aux1_print(struct seq_file *s, void *p) | |||
953 | int aux1_convert; | 953 | int aux1_convert; |
954 | struct ab8500_gpadc *gpadc; | 954 | struct ab8500_gpadc *gpadc; |
955 | 955 | ||
956 | gpadc = ab8500_gpadc_get(); | 956 | gpadc = ab8500_gpadc_get("ab8500-gpadc.0"); |
957 | aux1_raw = ab8500_gpadc_read_raw(gpadc, ADC_AUX1); | 957 | aux1_raw = ab8500_gpadc_read_raw(gpadc, ADC_AUX1); |
958 | aux1_convert = ab8500_gpadc_ad_to_voltage(gpadc, ADC_AUX1, | 958 | aux1_convert = ab8500_gpadc_ad_to_voltage(gpadc, ADC_AUX1, |
959 | aux1_raw); | 959 | aux1_raw); |
@@ -981,7 +981,7 @@ static int ab8500_gpadc_aux2_print(struct seq_file *s, void *p) | |||
981 | int aux2_convert; | 981 | int aux2_convert; |
982 | struct ab8500_gpadc *gpadc; | 982 | struct ab8500_gpadc *gpadc; |
983 | 983 | ||
984 | gpadc = ab8500_gpadc_get(); | 984 | gpadc = ab8500_gpadc_get("ab8500-gpadc.0"); |
985 | aux2_raw = ab8500_gpadc_read_raw(gpadc, ADC_AUX2); | 985 | aux2_raw = ab8500_gpadc_read_raw(gpadc, ADC_AUX2); |
986 | aux2_convert = ab8500_gpadc_ad_to_voltage(gpadc, ADC_AUX2, | 986 | aux2_convert = ab8500_gpadc_ad_to_voltage(gpadc, ADC_AUX2, |
987 | aux2_raw); | 987 | aux2_raw); |
@@ -1009,7 +1009,7 @@ static int ab8500_gpadc_main_bat_v_print(struct seq_file *s, void *p) | |||
1009 | int main_bat_v_convert; | 1009 | int main_bat_v_convert; |
1010 | struct ab8500_gpadc *gpadc; | 1010 | struct ab8500_gpadc *gpadc; |
1011 | 1011 | ||
1012 | gpadc = ab8500_gpadc_get(); | 1012 | gpadc = ab8500_gpadc_get("ab8500-gpadc.0"); |
1013 | main_bat_v_raw = ab8500_gpadc_read_raw(gpadc, MAIN_BAT_V); | 1013 | main_bat_v_raw = ab8500_gpadc_read_raw(gpadc, MAIN_BAT_V); |
1014 | main_bat_v_convert = ab8500_gpadc_ad_to_voltage(gpadc, MAIN_BAT_V, | 1014 | main_bat_v_convert = ab8500_gpadc_ad_to_voltage(gpadc, MAIN_BAT_V, |
1015 | main_bat_v_raw); | 1015 | main_bat_v_raw); |
@@ -1038,7 +1038,7 @@ static int ab8500_gpadc_vbus_v_print(struct seq_file *s, void *p) | |||
1038 | int vbus_v_convert; | 1038 | int vbus_v_convert; |
1039 | struct ab8500_gpadc *gpadc; | 1039 | struct ab8500_gpadc *gpadc; |
1040 | 1040 | ||
1041 | gpadc = ab8500_gpadc_get(); | 1041 | gpadc = ab8500_gpadc_get("ab8500-gpadc.0"); |
1042 | vbus_v_raw = ab8500_gpadc_read_raw(gpadc, VBUS_V); | 1042 | vbus_v_raw = ab8500_gpadc_read_raw(gpadc, VBUS_V); |
1043 | vbus_v_convert = ab8500_gpadc_ad_to_voltage(gpadc, VBUS_V, | 1043 | vbus_v_convert = ab8500_gpadc_ad_to_voltage(gpadc, VBUS_V, |
1044 | vbus_v_raw); | 1044 | vbus_v_raw); |
@@ -1066,7 +1066,7 @@ static int ab8500_gpadc_main_charger_c_print(struct seq_file *s, void *p) | |||
1066 | int main_charger_c_convert; | 1066 | int main_charger_c_convert; |
1067 | struct ab8500_gpadc *gpadc; | 1067 | struct ab8500_gpadc *gpadc; |
1068 | 1068 | ||
1069 | gpadc = ab8500_gpadc_get(); | 1069 | gpadc = ab8500_gpadc_get("ab8500-gpadc.0"); |
1070 | main_charger_c_raw = ab8500_gpadc_read_raw(gpadc, MAIN_CHARGER_C); | 1070 | main_charger_c_raw = ab8500_gpadc_read_raw(gpadc, MAIN_CHARGER_C); |
1071 | main_charger_c_convert = ab8500_gpadc_ad_to_voltage(gpadc, | 1071 | main_charger_c_convert = ab8500_gpadc_ad_to_voltage(gpadc, |
1072 | MAIN_CHARGER_C, main_charger_c_raw); | 1072 | 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) | |||
1096 | int usb_charger_c_convert; | 1096 | int usb_charger_c_convert; |
1097 | struct ab8500_gpadc *gpadc; | 1097 | struct ab8500_gpadc *gpadc; |
1098 | 1098 | ||
1099 | gpadc = ab8500_gpadc_get(); | 1099 | gpadc = ab8500_gpadc_get("ab8500-gpadc.0"); |
1100 | usb_charger_c_raw = ab8500_gpadc_read_raw(gpadc, USB_CHARGER_C); | 1100 | usb_charger_c_raw = ab8500_gpadc_read_raw(gpadc, USB_CHARGER_C); |
1101 | usb_charger_c_convert = ab8500_gpadc_ad_to_voltage(gpadc, | 1101 | usb_charger_c_convert = ab8500_gpadc_ad_to_voltage(gpadc, |
1102 | USB_CHARGER_C, usb_charger_c_raw); | 1102 | 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) | |||
1126 | int bk_bat_v_convert; | 1126 | int bk_bat_v_convert; |
1127 | struct ab8500_gpadc *gpadc; | 1127 | struct ab8500_gpadc *gpadc; |
1128 | 1128 | ||
1129 | gpadc = ab8500_gpadc_get(); | 1129 | gpadc = ab8500_gpadc_get("ab8500-gpadc.0"); |
1130 | bk_bat_v_raw = ab8500_gpadc_read_raw(gpadc, BK_BAT_V); | 1130 | bk_bat_v_raw = ab8500_gpadc_read_raw(gpadc, BK_BAT_V); |
1131 | bk_bat_v_convert = ab8500_gpadc_ad_to_voltage(gpadc, | 1131 | bk_bat_v_convert = ab8500_gpadc_ad_to_voltage(gpadc, |
1132 | BK_BAT_V, bk_bat_v_raw); | 1132 | BK_BAT_V, bk_bat_v_raw); |
@@ -1154,7 +1154,7 @@ static int ab8500_gpadc_die_temp_print(struct seq_file *s, void *p) | |||
1154 | int die_temp_convert; | 1154 | int die_temp_convert; |
1155 | struct ab8500_gpadc *gpadc; | 1155 | struct ab8500_gpadc *gpadc; |
1156 | 1156 | ||
1157 | gpadc = ab8500_gpadc_get(); | 1157 | gpadc = ab8500_gpadc_get("ab8500-gpadc.0"); |
1158 | die_temp_raw = ab8500_gpadc_read_raw(gpadc, DIE_TEMP); | 1158 | die_temp_raw = ab8500_gpadc_read_raw(gpadc, DIE_TEMP); |
1159 | die_temp_convert = ab8500_gpadc_ad_to_voltage(gpadc, DIE_TEMP, | 1159 | die_temp_convert = ab8500_gpadc_ad_to_voltage(gpadc, DIE_TEMP, |
1160 | die_temp_raw); | 1160 | die_temp_raw); |