Skip to content

Commit 9875219

Browse files
wensbjorn-helgaas
authored andcommitted
PCI: mediatek-gen3: Clean up mtk_pcie_parse_port() with dev_err_probe()
mtk_pcie_parse_port() in the pcie-mediatek-gen driver has a bunch of if (err) { dev_err(dev, "error message\n"); return err; # or goto } patterns. Simplify these with dev_err_probe(). The system also gains proper deferred probe messages that can be seen in: /sys/kernel/debug/devices_deferred Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> Signed-off-by: Manivannan Sadhasivam <mani@kernel.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com> Reviewed-by: Manivannan Sadhasivam <mani@kernel.org> Link: https://patch.msgid.link/20260324052002.4072430-2-wenst@chromium.org
1 parent 6de23f8 commit 9875219

1 file changed

Lines changed: 10 additions & 26 deletions

File tree

drivers/pci/controller/pcie-mediatek-gen3.c

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -876,10 +876,8 @@ static int mtk_pcie_parse_port(struct mtk_gen3_pcie *pcie)
876876
if (!regs)
877877
return -EINVAL;
878878
pcie->base = devm_ioremap_resource(dev, regs);
879-
if (IS_ERR(pcie->base)) {
880-
dev_err(dev, "failed to map register base\n");
881-
return PTR_ERR(pcie->base);
882-
}
879+
if (IS_ERR(pcie->base))
880+
return dev_err_probe(dev, PTR_ERR(pcie->base), "failed to map register base\n");
883881

884882
pcie->reg_base = regs->start;
885883

@@ -888,34 +886,20 @@ static int mtk_pcie_parse_port(struct mtk_gen3_pcie *pcie)
888886

889887
ret = devm_reset_control_bulk_get_optional_shared(dev, num_resets,
890888
pcie->phy_resets);
891-
if (ret) {
892-
dev_err(dev, "failed to get PHY bulk reset\n");
893-
return ret;
894-
}
889+
if (ret)
890+
return dev_err_probe(dev, ret, "failed to get PHY bulk reset\n");
895891

896892
pcie->mac_reset = devm_reset_control_get_optional_exclusive(dev, "mac");
897-
if (IS_ERR(pcie->mac_reset)) {
898-
ret = PTR_ERR(pcie->mac_reset);
899-
if (ret != -EPROBE_DEFER)
900-
dev_err(dev, "failed to get MAC reset\n");
901-
902-
return ret;
903-
}
893+
if (IS_ERR(pcie->mac_reset))
894+
return dev_err_probe(dev, PTR_ERR(pcie->mac_reset), "failed to get MAC reset\n");
904895

905896
pcie->phy = devm_phy_optional_get(dev, "pcie-phy");
906-
if (IS_ERR(pcie->phy)) {
907-
ret = PTR_ERR(pcie->phy);
908-
if (ret != -EPROBE_DEFER)
909-
dev_err(dev, "failed to get PHY\n");
910-
911-
return ret;
912-
}
897+
if (IS_ERR(pcie->phy))
898+
return dev_err_probe(dev, PTR_ERR(pcie->phy), "failed to get PHY\n");
913899

914900
pcie->num_clks = devm_clk_bulk_get_all(dev, &pcie->clks);
915-
if (pcie->num_clks < 0) {
916-
dev_err(dev, "failed to get clocks\n");
917-
return pcie->num_clks;
918-
}
901+
if (pcie->num_clks < 0)
902+
return dev_err_probe(dev, pcie->num_clks, "failed to get clocks\n");
919903

920904
ret = of_property_read_u32(dev->of_node, "num-lanes", &num_lanes);
921905
if (ret == 0) {

0 commit comments

Comments
 (0)