@@ -131,11 +131,12 @@ static inline void riic_clear_set_bit(struct riic_dev *riic, u8 clear, u8 set, u
131131static int riic_xfer (struct i2c_adapter * adap , struct i2c_msg msgs [], int num )
132132{
133133 struct riic_dev * riic = i2c_get_adapdata (adap );
134+ struct device * dev = adap -> dev .parent ;
134135 unsigned long time_left ;
135136 int i ;
136137 u8 start_bit ;
137138
138- pm_runtime_get_sync (adap -> dev . parent );
139+ pm_runtime_get_sync (dev );
139140
140141 if (riic_readb (riic , RIIC_ICCR2 ) & ICCR2_BBSY ) {
141142 riic -> err = - EBUSY ;
@@ -168,7 +169,7 @@ static int riic_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
168169 }
169170
170171 out :
171- pm_runtime_put (adap -> dev . parent );
172+ pm_runtime_put (dev );
172173
173174 return riic -> err ?: num ;
174175}
@@ -303,8 +304,9 @@ static int riic_init_hw(struct riic_dev *riic, struct i2c_timings *t)
303304 int ret = 0 ;
304305 unsigned long rate ;
305306 int total_ticks , cks , brl , brh ;
307+ struct device * dev = riic -> adapter .dev .parent ;
306308
307- pm_runtime_get_sync (riic -> adapter . dev . parent );
309+ pm_runtime_get_sync (dev );
308310
309311 if (t -> bus_freq_hz > I2C_MAX_FAST_MODE_FREQ ) {
310312 dev_err (& riic -> adapter .dev ,
@@ -396,7 +398,7 @@ static int riic_init_hw(struct riic_dev *riic, struct i2c_timings *t)
396398 riic_clear_set_bit (riic , ICCR1_IICRST , 0 , RIIC_ICCR1 );
397399
398400out :
399- pm_runtime_put (riic -> adapter . dev . parent );
401+ pm_runtime_put (dev );
400402 return ret ;
401403}
402404
@@ -415,36 +417,37 @@ static void riic_reset_control_assert(void *data)
415417
416418static int riic_i2c_probe (struct platform_device * pdev )
417419{
420+ struct device * dev = & pdev -> dev ;
418421 struct riic_dev * riic ;
419422 struct i2c_adapter * adap ;
420423 struct i2c_timings i2c_t ;
421424 struct reset_control * rstc ;
422425 int i , ret ;
423426
424- riic = devm_kzalloc (& pdev -> dev , sizeof (* riic ), GFP_KERNEL );
427+ riic = devm_kzalloc (dev , sizeof (* riic ), GFP_KERNEL );
425428 if (!riic )
426429 return - ENOMEM ;
427430
428431 riic -> base = devm_platform_ioremap_resource (pdev , 0 );
429432 if (IS_ERR (riic -> base ))
430433 return PTR_ERR (riic -> base );
431434
432- riic -> clk = devm_clk_get (& pdev -> dev , NULL );
435+ riic -> clk = devm_clk_get (dev , NULL );
433436 if (IS_ERR (riic -> clk )) {
434- dev_err (& pdev -> dev , "missing controller clock" );
437+ dev_err (dev , "missing controller clock" );
435438 return PTR_ERR (riic -> clk );
436439 }
437440
438- rstc = devm_reset_control_get_optional_exclusive (& pdev -> dev , NULL );
441+ rstc = devm_reset_control_get_optional_exclusive (dev , NULL );
439442 if (IS_ERR (rstc ))
440- return dev_err_probe (& pdev -> dev , PTR_ERR (rstc ),
443+ return dev_err_probe (dev , PTR_ERR (rstc ),
441444 "Error: missing reset ctrl\n" );
442445
443446 ret = reset_control_deassert (rstc );
444447 if (ret )
445448 return ret ;
446449
447- ret = devm_add_action_or_reset (& pdev -> dev , riic_reset_control_assert , rstc );
450+ ret = devm_add_action_or_reset (dev , riic_reset_control_assert , rstc );
448451 if (ret )
449452 return ret ;
450453
@@ -453,29 +456,29 @@ static int riic_i2c_probe(struct platform_device *pdev)
453456 if (ret < 0 )
454457 return ret ;
455458
456- ret = devm_request_irq (& pdev -> dev , ret , riic_irqs [i ].isr ,
459+ ret = devm_request_irq (dev , ret , riic_irqs [i ].isr ,
457460 0 , riic_irqs [i ].name , riic );
458461 if (ret ) {
459- dev_err (& pdev -> dev , "failed to request irq %s\n" , riic_irqs [i ].name );
462+ dev_err (dev , "failed to request irq %s\n" , riic_irqs [i ].name );
460463 return ret ;
461464 }
462465 }
463466
464- riic -> info = of_device_get_match_data (& pdev -> dev );
467+ riic -> info = of_device_get_match_data (dev );
465468
466469 adap = & riic -> adapter ;
467470 i2c_set_adapdata (adap , riic );
468471 strscpy (adap -> name , "Renesas RIIC adapter" , sizeof (adap -> name ));
469472 adap -> owner = THIS_MODULE ;
470473 adap -> algo = & riic_algo ;
471- adap -> dev .parent = & pdev -> dev ;
472- adap -> dev .of_node = pdev -> dev . of_node ;
474+ adap -> dev .parent = dev ;
475+ adap -> dev .of_node = dev -> of_node ;
473476
474477 init_completion (& riic -> msg_done );
475478
476- i2c_parse_fw_timings (& pdev -> dev , & i2c_t , true);
479+ i2c_parse_fw_timings (dev , & i2c_t , true);
477480
478- pm_runtime_enable (& pdev -> dev );
481+ pm_runtime_enable (dev );
479482
480483 ret = riic_init_hw (riic , & i2c_t );
481484 if (ret )
@@ -487,24 +490,24 @@ static int riic_i2c_probe(struct platform_device *pdev)
487490
488491 platform_set_drvdata (pdev , riic );
489492
490- dev_info (& pdev -> dev , "registered with %dHz bus speed\n" ,
491- i2c_t .bus_freq_hz );
493+ dev_info (dev , "registered with %dHz bus speed\n" , i2c_t .bus_freq_hz );
492494 return 0 ;
493495
494496out :
495- pm_runtime_disable (& pdev -> dev );
497+ pm_runtime_disable (dev );
496498 return ret ;
497499}
498500
499501static void riic_i2c_remove (struct platform_device * pdev )
500502{
501503 struct riic_dev * riic = platform_get_drvdata (pdev );
504+ struct device * dev = & pdev -> dev ;
502505
503- pm_runtime_get_sync (& pdev -> dev );
506+ pm_runtime_get_sync (dev );
504507 riic_writeb (riic , 0 , RIIC_ICIER );
505- pm_runtime_put (& pdev -> dev );
508+ pm_runtime_put (dev );
506509 i2c_del_adapter (& riic -> adapter );
507- pm_runtime_disable (& pdev -> dev );
510+ pm_runtime_disable (dev );
508511}
509512
510513static const struct riic_of_data riic_rz_a_info = {
0 commit comments