@@ -118,10 +118,17 @@ static bool is_batt_present(struct charger_manager *cm)
118118 present = true;
119119 break ;
120120 case CM_CHARGER_STAT :
121- for (i = 0 ; cm -> charger_stat [i ]; i ++ ) {
122- ret = cm -> charger_stat [i ]-> get_property (
123- cm -> charger_stat [i ],
124- POWER_SUPPLY_PROP_PRESENT , & val );
121+ for (i = 0 ; cm -> desc -> psy_charger_stat [i ]; i ++ ) {
122+ psy = power_supply_get_by_name (
123+ cm -> desc -> psy_charger_stat [i ]);
124+ if (!psy ) {
125+ dev_err (cm -> dev , "Cannot find power supply \"%s\"\n" ,
126+ cm -> desc -> psy_charger_stat [i ]);
127+ continue ;
128+ }
129+
130+ ret = psy -> get_property (psy , POWER_SUPPLY_PROP_PRESENT ,
131+ & val );
125132 if (ret == 0 && val .intval ) {
126133 present = true;
127134 break ;
@@ -144,14 +151,20 @@ static bool is_batt_present(struct charger_manager *cm)
144151static bool is_ext_pwr_online (struct charger_manager * cm )
145152{
146153 union power_supply_propval val ;
154+ struct power_supply * psy ;
147155 bool online = false;
148156 int i , ret ;
149157
150158 /* If at least one of them has one, it's yes. */
151- for (i = 0 ; cm -> charger_stat [i ]; i ++ ) {
152- ret = cm -> charger_stat [i ]-> get_property (
153- cm -> charger_stat [i ],
154- POWER_SUPPLY_PROP_ONLINE , & val );
159+ for (i = 0 ; cm -> desc -> psy_charger_stat [i ]; i ++ ) {
160+ psy = power_supply_get_by_name (cm -> desc -> psy_charger_stat [i ]);
161+ if (!psy ) {
162+ dev_err (cm -> dev , "Cannot find power supply \"%s\"\n" ,
163+ cm -> desc -> psy_charger_stat [i ]);
164+ continue ;
165+ }
166+
167+ ret = psy -> get_property (psy , POWER_SUPPLY_PROP_ONLINE , & val );
155168 if (ret == 0 && val .intval ) {
156169 online = true;
157170 break ;
@@ -196,24 +209,30 @@ static bool is_charging(struct charger_manager *cm)
196209{
197210 int i , ret ;
198211 bool charging = false;
212+ struct power_supply * psy ;
199213 union power_supply_propval val ;
200214
201215 /* If there is no battery, it cannot be charged */
202216 if (!is_batt_present (cm ))
203217 return false;
204218
205219 /* If at least one of the charger is charging, return yes */
206- for (i = 0 ; cm -> charger_stat [i ]; i ++ ) {
220+ for (i = 0 ; cm -> desc -> psy_charger_stat [i ]; i ++ ) {
207221 /* 1. The charger sholuld not be DISABLED */
208222 if (cm -> emergency_stop )
209223 continue ;
210224 if (!cm -> charger_enabled )
211225 continue ;
212226
227+ psy = power_supply_get_by_name (cm -> desc -> psy_charger_stat [i ]);
228+ if (!psy ) {
229+ dev_err (cm -> dev , "Cannot find power supply \"%s\"\n" ,
230+ cm -> desc -> psy_charger_stat [i ]);
231+ continue ;
232+ }
233+
213234 /* 2. The charger should be online (ext-power) */
214- ret = cm -> charger_stat [i ]-> get_property (
215- cm -> charger_stat [i ],
216- POWER_SUPPLY_PROP_ONLINE , & val );
235+ ret = psy -> get_property (psy , POWER_SUPPLY_PROP_ONLINE , & val );
217236 if (ret ) {
218237 dev_warn (cm -> dev , "Cannot read ONLINE value from %s\n" ,
219238 cm -> desc -> psy_charger_stat [i ]);
@@ -226,9 +245,7 @@ static bool is_charging(struct charger_manager *cm)
226245 * 3. The charger should not be FULL, DISCHARGING,
227246 * or NOT_CHARGING.
228247 */
229- ret = cm -> charger_stat [i ]-> get_property (
230- cm -> charger_stat [i ],
231- POWER_SUPPLY_PROP_STATUS , & val );
248+ ret = psy -> get_property (psy , POWER_SUPPLY_PROP_STATUS , & val );
232249 if (ret ) {
233250 dev_warn (cm -> dev , "Cannot read STATUS value from %s\n" ,
234251 cm -> desc -> psy_charger_stat [i ]);
@@ -1772,15 +1789,12 @@ static int charger_manager_probe(struct platform_device *pdev)
17721789 while (desc -> psy_charger_stat [i ])
17731790 i ++ ;
17741791
1775- cm -> charger_stat = devm_kzalloc (& pdev -> dev ,
1776- sizeof (struct power_supply * ) * i , GFP_KERNEL );
1777- if (!cm -> charger_stat )
1778- return - ENOMEM ;
1779-
1792+ /* Check if charger's supplies are present at probe */
17801793 for (i = 0 ; desc -> psy_charger_stat [i ]; i ++ ) {
1781- cm -> charger_stat [i ] = power_supply_get_by_name (
1782- desc -> psy_charger_stat [i ]);
1783- if (!cm -> charger_stat [i ]) {
1794+ struct power_supply * psy ;
1795+
1796+ psy = power_supply_get_by_name (desc -> psy_charger_stat [i ]);
1797+ if (!psy ) {
17841798 dev_err (& pdev -> dev , "Cannot find power supply \"%s\"\n" ,
17851799 desc -> psy_charger_stat [i ]);
17861800 return - ENODEV ;
@@ -2102,8 +2116,8 @@ static bool find_power_supply(struct charger_manager *cm,
21022116 int i ;
21032117 bool found = false;
21042118
2105- for (i = 0 ; cm -> charger_stat [i ]; i ++ ) {
2106- if (psy == cm -> charger_stat [i ]) {
2119+ for (i = 0 ; cm -> desc -> psy_charger_stat [i ]; i ++ ) {
2120+ if (! strcmp ( psy -> name , cm -> desc -> psy_charger_stat [i ]) ) {
21072121 found = true;
21082122 break ;
21092123 }
0 commit comments