File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -989,10 +989,9 @@ static int tegra186_asrc_platform_probe(struct platform_device *pdev)
989989
990990 asrc -> regmap = devm_regmap_init_mmio (dev , regs ,
991991 & tegra186_asrc_regmap_config );
992- if (IS_ERR (asrc -> regmap )) {
993- dev_err (dev , "regmap init failed\n" );
994- return PTR_ERR (asrc -> regmap );
995- }
992+ if (IS_ERR (asrc -> regmap ))
993+ return dev_err_probe (dev , PTR_ERR (asrc -> regmap ),
994+ "regmap init failed\n" );
996995
997996 asrc -> soc_data = of_device_get_match_data (& pdev -> dev );
998997
Original file line number Diff line number Diff line change @@ -506,10 +506,9 @@ static int tegra186_dspk_platform_probe(struct platform_device *pdev)
506506 return PTR_ERR (regs );
507507
508508 dspk -> regmap = devm_regmap_init_mmio (dev , regs , & tegra186_dspk_regmap );
509- if (IS_ERR (dspk -> regmap )) {
510- dev_err (dev , "regmap init failed\n" );
511- return PTR_ERR (dspk -> regmap );
512- }
509+ if (IS_ERR (dspk -> regmap ))
510+ return dev_err_probe (dev , PTR_ERR (dspk -> regmap ),
511+ "regmap init failed\n" );
513512
514513 regcache_cache_only (dspk -> regmap , true);
515514
Original file line number Diff line number Diff line change @@ -693,10 +693,9 @@ static int tegra210_adx_platform_probe(struct platform_device *pdev)
693693
694694 adx -> regmap = devm_regmap_init_mmio (dev , regs ,
695695 soc_data -> regmap_conf );
696- if (IS_ERR (adx -> regmap )) {
697- dev_err (dev , "regmap init failed\n" );
698- return PTR_ERR (adx -> regmap );
699- }
696+ if (IS_ERR (adx -> regmap ))
697+ return dev_err_probe (dev , PTR_ERR (adx -> regmap ),
698+ "regmap init failed\n" );
700699
701700 regcache_cache_only (adx -> regmap , true);
702701
Original file line number Diff line number Diff line change @@ -2276,10 +2276,9 @@ static int tegra_ahub_probe(struct platform_device *pdev)
22762276
22772277 ahub -> regmap = devm_regmap_init_mmio (& pdev -> dev , regs ,
22782278 ahub -> soc_data -> regmap_config );
2279- if (IS_ERR (ahub -> regmap )) {
2280- dev_err (& pdev -> dev , "regmap init failed\n" );
2281- return PTR_ERR (ahub -> regmap );
2282- }
2279+ if (IS_ERR (ahub -> regmap ))
2280+ return dev_err_probe (& pdev -> dev , PTR_ERR (ahub -> regmap ),
2281+ "regmap init failed\n" );
22832282
22842283 regcache_cache_only (ahub -> regmap , true);
22852284
Original file line number Diff line number Diff line change @@ -743,10 +743,9 @@ static int tegra210_amx_platform_probe(struct platform_device *pdev)
743743
744744 amx -> regmap = devm_regmap_init_mmio (dev , regs ,
745745 amx -> soc_data -> regmap_conf );
746- if (IS_ERR (amx -> regmap )) {
747- dev_err (dev , "regmap init failed\n" );
748- return PTR_ERR (amx -> regmap );
749- }
746+ if (IS_ERR (amx -> regmap ))
747+ return dev_err_probe (dev , PTR_ERR (amx -> regmap ),
748+ "regmap init failed\n" );
750749
751750 regcache_cache_only (amx -> regmap , true);
752751
Original file line number Diff line number Diff line change @@ -518,10 +518,9 @@ static int tegra210_dmic_probe(struct platform_device *pdev)
518518
519519 dmic -> regmap = devm_regmap_init_mmio (dev , regs ,
520520 & tegra210_dmic_regmap_config );
521- if (IS_ERR (dmic -> regmap )) {
522- dev_err (dev , "regmap init failed\n" );
523- return PTR_ERR (dmic -> regmap );
524- }
521+ if (IS_ERR (dmic -> regmap ))
522+ return dev_err_probe (dev , PTR_ERR (dmic -> regmap ),
523+ "regmap init failed\n" );
525524
526525 regcache_cache_only (dmic -> regmap , true);
527526
Original file line number Diff line number Diff line change @@ -1090,10 +1090,9 @@ static int tegra210_i2s_probe(struct platform_device *pdev)
10901090
10911091 i2s -> regmap = devm_regmap_init_mmio (dev , regs ,
10921092 i2s -> soc_data -> regmap_conf );
1093- if (IS_ERR (i2s -> regmap )) {
1094- dev_err (dev , "regmap init failed\n" );
1095- return PTR_ERR (i2s -> regmap );
1096- }
1093+ if (IS_ERR (i2s -> regmap ))
1094+ return dev_err_probe (dev , PTR_ERR (i2s -> regmap ),
1095+ "regmap init failed\n" );
10971096
10981097 tegra210_parse_client_convert (dev );
10991098
Original file line number Diff line number Diff line change @@ -641,10 +641,9 @@ static int tegra210_mixer_platform_probe(struct platform_device *pdev)
641641
642642 mixer -> regmap = devm_regmap_init_mmio (dev , regs ,
643643 & tegra210_mixer_regmap_config );
644- if (IS_ERR (mixer -> regmap )) {
645- dev_err (dev , "regmap init failed\n" );
646- return PTR_ERR (mixer -> regmap );
647- }
644+ if (IS_ERR (mixer -> regmap ))
645+ return dev_err_probe (dev , PTR_ERR (mixer -> regmap ),
646+ "regmap init failed\n" );
648647
649648 regcache_cache_only (mixer -> regmap , true);
650649
Original file line number Diff line number Diff line change @@ -731,10 +731,9 @@ static int tegra210_mvc_platform_probe(struct platform_device *pdev)
731731
732732 mvc -> regmap = devm_regmap_init_mmio (dev , regs ,
733733 & tegra210_mvc_regmap_config );
734- if (IS_ERR (mvc -> regmap )) {
735- dev_err (dev , "regmap init failed\n" );
736- return PTR_ERR (mvc -> regmap );
737- }
734+ if (IS_ERR (mvc -> regmap ))
735+ return dev_err_probe (dev , PTR_ERR (mvc -> regmap ),
736+ "regmap init failed\n" );
738737
739738 regcache_cache_only (mvc -> regmap , true);
740739
Original file line number Diff line number Diff line change @@ -3598,10 +3598,9 @@ static int tegra210_sfc_platform_probe(struct platform_device *pdev)
35983598
35993599 sfc -> regmap = devm_regmap_init_mmio (dev , regs ,
36003600 & tegra210_sfc_regmap_config );
3601- if (IS_ERR (sfc -> regmap )) {
3602- dev_err (dev , "regmap init failed\n" );
3603- return PTR_ERR (sfc -> regmap );
3604- }
3601+ if (IS_ERR (sfc -> regmap ))
3602+ return dev_err_probe (dev , PTR_ERR (sfc -> regmap ),
3603+ "regmap init failed\n" );
36053604
36063605 regcache_cache_only (sfc -> regmap , true);
36073606
You can’t perform that action at this time.
0 commit comments