Skip to content

Commit 7ad250e

Browse files
Zhang Zekunwens
authored andcommitted
bus: sunxi-rsb: Simplify code with dev_err_probe()
Use dev_err_probe() directly in the driver probe phase. This can simplify the code a bit. Signed-off-by: Zhang Zekun <zhangzekun11@huawei.com> Link: https://lore.kernel.org/r/20240905114134.80310-1-zhangzekun11@huawei.com Signed-off-by: Chen-Yu Tsai <wens@csie.org>
1 parent 8400291 commit 7ad250e

1 file changed

Lines changed: 13 additions & 21 deletions

File tree

drivers/bus/sunxi-rsb.c

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -751,12 +751,10 @@ static int sunxi_rsb_probe(struct platform_device *pdev)
751751
int irq, ret;
752752

753753
of_property_read_u32(np, "clock-frequency", &clk_freq);
754-
if (clk_freq > RSB_MAX_FREQ) {
755-
dev_err(dev,
756-
"clock-frequency (%u Hz) is too high (max = 20MHz)\n",
757-
clk_freq);
758-
return -EINVAL;
759-
}
754+
if (clk_freq > RSB_MAX_FREQ)
755+
return dev_err_probe(dev, -EINVAL,
756+
"clock-frequency (%u Hz) is too high (max = 20MHz)\n",
757+
clk_freq);
760758

761759
rsb = devm_kzalloc(dev, sizeof(*rsb), GFP_KERNEL);
762760
if (!rsb)
@@ -774,28 +772,22 @@ static int sunxi_rsb_probe(struct platform_device *pdev)
774772
return irq;
775773

776774
rsb->clk = devm_clk_get(dev, NULL);
777-
if (IS_ERR(rsb->clk)) {
778-
ret = PTR_ERR(rsb->clk);
779-
dev_err(dev, "failed to retrieve clk: %d\n", ret);
780-
return ret;
781-
}
775+
if (IS_ERR(rsb->clk))
776+
return dev_err_probe(dev, PTR_ERR(rsb->clk),
777+
"failed to retrieve clk\n");
782778

783779
rsb->rstc = devm_reset_control_get(dev, NULL);
784-
if (IS_ERR(rsb->rstc)) {
785-
ret = PTR_ERR(rsb->rstc);
786-
dev_err(dev, "failed to retrieve reset controller: %d\n", ret);
787-
return ret;
788-
}
780+
if (IS_ERR(rsb->rstc))
781+
return dev_err_probe(dev, PTR_ERR(rsb->rstc),
782+
"failed to retrieve reset controller\n");
789783

790784
init_completion(&rsb->complete);
791785
mutex_init(&rsb->lock);
792786

793787
ret = devm_request_irq(dev, irq, sunxi_rsb_irq, 0, RSB_CTRL_NAME, rsb);
794-
if (ret) {
795-
dev_err(dev, "can't register interrupt handler irq %d: %d\n",
796-
irq, ret);
797-
return ret;
798-
}
788+
if (ret)
789+
return dev_err_probe(dev, ret,
790+
"can't register interrupt handler irq %d\n", irq);
799791

800792
ret = sunxi_rsb_hw_init(rsb);
801793
if (ret)

0 commit comments

Comments
 (0)