@@ -200,11 +200,11 @@ static int __power_supply_populate_supplied_from(struct power_supply *epsy,
200
200
int i = 0 ;
201
201
202
202
do {
203
- np = of_parse_phandle (psy -> of_node , "power-supplies" , i ++ );
203
+ np = of_parse_phandle (psy -> dev . of_node , "power-supplies" , i ++ );
204
204
if (!np )
205
205
break ;
206
206
207
- if (np == epsy -> of_node ) {
207
+ if (np == epsy -> dev . of_node ) {
208
208
dev_dbg (& psy -> dev , "%s: Found supply : %s\n" ,
209
209
psy -> desc -> name , epsy -> desc -> name );
210
210
psy -> supplied_from [i - 1 ] = (char * )epsy -> desc -> name ;
@@ -235,7 +235,7 @@ static int __power_supply_find_supply_from_node(struct power_supply *epsy,
235
235
struct device_node * np = data ;
236
236
237
237
/* returning non-zero breaks out of power_supply_for_each_psy loop */
238
- if (epsy -> of_node == np )
238
+ if (epsy -> dev . of_node == np )
239
239
return 1 ;
240
240
241
241
return 0 ;
@@ -270,13 +270,13 @@ static int power_supply_check_supplies(struct power_supply *psy)
270
270
return 0 ;
271
271
272
272
/* No device node found, nothing to do */
273
- if (!psy -> of_node )
273
+ if (!psy -> dev . of_node )
274
274
return 0 ;
275
275
276
276
do {
277
277
int ret ;
278
278
279
- np = of_parse_phandle (psy -> of_node , "power-supplies" , cnt ++ );
279
+ np = of_parse_phandle (psy -> dev . of_node , "power-supplies" , cnt ++ );
280
280
if (!np )
281
281
break ;
282
282
@@ -593,8 +593,8 @@ int power_supply_get_battery_info(struct power_supply *psy,
593
593
const __be32 * list ;
594
594
u32 min_max [2 ];
595
595
596
- if (psy -> of_node ) {
597
- battery_np = of_parse_phandle (psy -> of_node , "monitored-battery" , 0 );
596
+ if (psy -> dev . of_node ) {
597
+ battery_np = of_parse_phandle (psy -> dev . of_node , "monitored-battery" , 0 );
598
598
if (!battery_np )
599
599
return - ENODEV ;
600
600
@@ -1531,9 +1531,8 @@ __power_supply_register(struct device *parent,
1531
1531
if (cfg ) {
1532
1532
dev -> groups = cfg -> attr_grp ;
1533
1533
psy -> drv_data = cfg -> drv_data ;
1534
- psy -> of_node =
1534
+ dev -> of_node =
1535
1535
cfg -> fwnode ? to_of_node (cfg -> fwnode ) : cfg -> of_node ;
1536
- dev -> of_node = psy -> of_node ;
1537
1536
psy -> supplied_to = cfg -> supplied_to ;
1538
1537
psy -> num_supplicants = cfg -> num_supplicants ;
1539
1538
}
0 commit comments