Skip to content

Commit 085cf53

Browse files
andy-shevbroonie
authored andcommitted
spi: sg2044-nor: Convert to dev_err_probe()
One of the cases in sg2044_spifmc_probe() may be converted to use dev_err_probe(). Do it. While at it, use local device pointer in all such calls and drop unneeded __func__ parameter as dev_err_probe() is assumed to be called only during probe phase. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://patch.msgid.link/20250313111423.322775-3-andriy.shevchenko@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent c6d9496 commit 085cf53

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

drivers/spi/spi-sg2044-nor.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -439,9 +439,7 @@ static int sg2044_spifmc_probe(struct platform_device *pdev)
439439

440440
spifmc->clk = devm_clk_get_enabled(&pdev->dev, NULL);
441441
if (IS_ERR(spifmc->clk))
442-
return dev_err_probe(&pdev->dev, PTR_ERR(spifmc->clk),
443-
"%s: Cannot get and enable AHB clock\n",
444-
__func__);
442+
return dev_err_probe(dev, PTR_ERR(spifmc->clk), "Cannot get and enable AHB clock\n");
445443

446444
spifmc->dev = &pdev->dev;
447445
spifmc->ctrl = ctrl;
@@ -465,10 +463,8 @@ static int sg2044_spifmc_probe(struct platform_device *pdev)
465463
sg2044_spifmc_init_reg(spifmc);
466464

467465
ret = devm_spi_register_controller(&pdev->dev, ctrl);
468-
if (ret) {
469-
dev_err(&pdev->dev, "spi_register_controller failed\n");
470-
return ret;
471-
}
466+
if (ret)
467+
return dev_err_probe(dev, ret, "spi_register_controller failed\n");
472468

473469
return 0;
474470
}

0 commit comments

Comments
 (0)