@@ -666,7 +666,7 @@ static bool rockchip_spi_can_dma(struct spi_master *master,
666
666
667
667
static int rockchip_spi_probe (struct platform_device * pdev )
668
668
{
669
- int ret = 0 ;
669
+ int ret ;
670
670
struct rockchip_spi * rs ;
671
671
struct spi_master * master ;
672
672
struct resource * mem ;
@@ -703,13 +703,13 @@ static int rockchip_spi_probe(struct platform_device *pdev)
703
703
}
704
704
705
705
ret = clk_prepare_enable (rs -> apb_pclk );
706
- if (ret ) {
706
+ if (ret < 0 ) {
707
707
dev_err (& pdev -> dev , "Failed to enable apb_pclk\n" );
708
708
goto err_put_master ;
709
709
}
710
710
711
711
ret = clk_prepare_enable (rs -> spiclk );
712
- if (ret ) {
712
+ if (ret < 0 ) {
713
713
dev_err (& pdev -> dev , "Failed to enable spi_clk\n" );
714
714
goto err_disable_apbclk ;
715
715
}
@@ -786,7 +786,7 @@ static int rockchip_spi_probe(struct platform_device *pdev)
786
786
}
787
787
788
788
ret = devm_spi_register_master (& pdev -> dev , master );
789
- if (ret ) {
789
+ if (ret < 0 ) {
790
790
dev_err (& pdev -> dev , "Failed to register master\n" );
791
791
goto err_free_dma_rx ;
792
792
}
@@ -834,12 +834,12 @@ static int rockchip_spi_remove(struct platform_device *pdev)
834
834
#ifdef CONFIG_PM_SLEEP
835
835
static int rockchip_spi_suspend (struct device * dev )
836
836
{
837
- int ret = 0 ;
837
+ int ret ;
838
838
struct spi_master * master = dev_get_drvdata (dev );
839
839
struct rockchip_spi * rs = spi_master_get_devdata (master );
840
840
841
841
ret = spi_master_suspend (rs -> master );
842
- if (ret )
842
+ if (ret < 0 )
843
843
return ret ;
844
844
845
845
if (!pm_runtime_suspended (dev )) {
@@ -849,12 +849,12 @@ static int rockchip_spi_suspend(struct device *dev)
849
849
850
850
pinctrl_pm_select_sleep_state (dev );
851
851
852
- return ret ;
852
+ return 0 ;
853
853
}
854
854
855
855
static int rockchip_spi_resume (struct device * dev )
856
856
{
857
- int ret = 0 ;
857
+ int ret ;
858
858
struct spi_master * master = dev_get_drvdata (dev );
859
859
struct rockchip_spi * rs = spi_master_get_devdata (master );
860
860
@@ -878,7 +878,7 @@ static int rockchip_spi_resume(struct device *dev)
878
878
clk_disable_unprepare (rs -> apb_pclk );
879
879
}
880
880
881
- return ret ;
881
+ return 0 ;
882
882
}
883
883
#endif /* CONFIG_PM_SLEEP */
884
884
@@ -901,14 +901,14 @@ static int rockchip_spi_runtime_resume(struct device *dev)
901
901
struct rockchip_spi * rs = spi_master_get_devdata (master );
902
902
903
903
ret = clk_prepare_enable (rs -> apb_pclk );
904
- if (ret )
904
+ if (ret < 0 )
905
905
return ret ;
906
906
907
907
ret = clk_prepare_enable (rs -> spiclk );
908
- if (ret )
908
+ if (ret < 0 )
909
909
clk_disable_unprepare (rs -> apb_pclk );
910
910
911
- return ret ;
911
+ return 0 ;
912
912
}
913
913
#endif /* CONFIG_PM */
914
914
0 commit comments