@@ -601,28 +601,29 @@ static inline void imx_thermal_unregister_legacy_cooling(struct imx_thermal_data
601
601
602
602
static int imx_thermal_probe (struct platform_device * pdev )
603
603
{
604
+ struct device * dev = & pdev -> dev ;
604
605
struct imx_thermal_data * data ;
605
606
struct regmap * map ;
606
607
int measure_freq ;
607
608
int ret ;
608
609
609
- data = devm_kzalloc (& pdev -> dev , sizeof (* data ), GFP_KERNEL );
610
+ data = devm_kzalloc (dev , sizeof (* data ), GFP_KERNEL );
610
611
if (!data )
611
612
return - ENOMEM ;
612
613
613
- data -> dev = & pdev -> dev ;
614
+ data -> dev = dev ;
614
615
615
- map = syscon_regmap_lookup_by_phandle (pdev -> dev . of_node , "fsl,tempmon" );
616
+ map = syscon_regmap_lookup_by_phandle (dev -> of_node , "fsl,tempmon" );
616
617
if (IS_ERR (map )) {
617
618
ret = PTR_ERR (map );
618
- dev_err (& pdev -> dev , "failed to get tempmon regmap: %d\n" , ret );
619
+ dev_err (dev , "failed to get tempmon regmap: %d\n" , ret );
619
620
return ret ;
620
621
}
621
622
data -> tempmon = map ;
622
623
623
- data -> socdata = of_device_get_match_data (& pdev -> dev );
624
+ data -> socdata = of_device_get_match_data (dev );
624
625
if (!data -> socdata ) {
625
- dev_err (& pdev -> dev , "no device match found\n" );
626
+ dev_err (dev , "no device match found\n" );
626
627
return - ENODEV ;
627
628
}
628
629
@@ -645,15 +646,15 @@ static int imx_thermal_probe(struct platform_device *pdev)
645
646
646
647
platform_set_drvdata (pdev , data );
647
648
648
- if (of_property_present (pdev -> dev . of_node , "nvmem-cells" )) {
649
+ if (of_property_present (dev -> of_node , "nvmem-cells" )) {
649
650
ret = imx_init_from_nvmem_cells (pdev );
650
651
if (ret )
651
- return dev_err_probe (& pdev -> dev , ret ,
652
+ return dev_err_probe (dev , ret ,
652
653
"failed to init from nvmem\n" );
653
654
} else {
654
655
ret = imx_init_from_tempmon_data (pdev );
655
656
if (ret ) {
656
- dev_err (& pdev -> dev , "failed to init from fsl,tempmon-data\n" );
657
+ dev_err (dev , "failed to init from fsl,tempmon-data\n" );
657
658
return ret ;
658
659
}
659
660
}
@@ -673,15 +674,14 @@ static int imx_thermal_probe(struct platform_device *pdev)
673
674
674
675
ret = imx_thermal_register_legacy_cooling (data );
675
676
if (ret )
676
- return dev_err_probe (& pdev -> dev , ret ,
677
+ return dev_err_probe (dev , ret ,
677
678
"failed to register cpufreq cooling device\n" );
678
679
679
- data -> thermal_clk = devm_clk_get (& pdev -> dev , NULL );
680
+ data -> thermal_clk = devm_clk_get (dev , NULL );
680
681
if (IS_ERR (data -> thermal_clk )) {
681
682
ret = PTR_ERR (data -> thermal_clk );
682
683
if (ret != - EPROBE_DEFER )
683
- dev_err (& pdev -> dev ,
684
- "failed to get thermal clk: %d\n" , ret );
684
+ dev_err (dev , "failed to get thermal clk: %d\n" , ret );
685
685
goto legacy_cleanup ;
686
686
}
687
687
@@ -694,7 +694,7 @@ static int imx_thermal_probe(struct platform_device *pdev)
694
694
*/
695
695
ret = clk_prepare_enable (data -> thermal_clk );
696
696
if (ret ) {
697
- dev_err (& pdev -> dev , "failed to enable thermal clk: %d\n" , ret );
697
+ dev_err (dev , "failed to enable thermal clk: %d\n" , ret );
698
698
goto legacy_cleanup ;
699
699
}
700
700
@@ -707,12 +707,12 @@ static int imx_thermal_probe(struct platform_device *pdev)
707
707
IMX_POLLING_DELAY );
708
708
if (IS_ERR (data -> tz )) {
709
709
ret = PTR_ERR (data -> tz );
710
- dev_err (& pdev -> dev ,
711
- "failed to register thermal zone device %d\n" , ret );
710
+ dev_err (dev , "failed to register thermal zone device %d\n" ,
711
+ ret );
712
712
goto clk_disable ;
713
713
}
714
714
715
- dev_info (& pdev -> dev , "%s CPU temperature grade - max:%dC"
715
+ dev_info (dev , "%s CPU temperature grade - max:%dC"
716
716
" critical:%dC passive:%dC\n" , data -> temp_grade ,
717
717
data -> temp_max / 1000 , trips [IMX_TRIP_CRITICAL ].temperature / 1000 ,
718
718
trips [IMX_TRIP_PASSIVE ].temperature / 1000 );
@@ -736,7 +736,7 @@ static int imx_thermal_probe(struct platform_device *pdev)
736
736
usleep_range (20 , 50 );
737
737
738
738
/* the core was configured and enabled just before */
739
- pm_runtime_set_active (& pdev -> dev );
739
+ pm_runtime_set_active (dev );
740
740
pm_runtime_enable (data -> dev );
741
741
742
742
ret = pm_runtime_resume_and_get (data -> dev );
@@ -748,11 +748,11 @@ static int imx_thermal_probe(struct platform_device *pdev)
748
748
if (ret )
749
749
goto thermal_zone_unregister ;
750
750
751
- ret = devm_request_threaded_irq (& pdev -> dev , data -> irq ,
751
+ ret = devm_request_threaded_irq (dev , data -> irq ,
752
752
imx_thermal_alarm_irq , imx_thermal_alarm_irq_thread ,
753
753
0 , "imx_thermal" , data );
754
754
if (ret < 0 ) {
755
- dev_err (& pdev -> dev , "failed to request alarm irq: %d\n" , ret );
755
+ dev_err (dev , "failed to request alarm irq: %d\n" , ret );
756
756
goto thermal_zone_unregister ;
757
757
}
758
758
0 commit comments