On Fri, 30 Aug 2024 11:58:15 +0800 Zhang Zekun <zhangzekun11@xxxxxxxxxx> wrote: > The combination of dev_err() and the returned error code could be > replaced by dev_err_probe() in driver's probe function. Let's, > converting to dev_err_probe() to make code more simple. > > Suggested-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx> > Signed-off-by: Zhang Zekun <zhangzekun11@xxxxxxxxxx> There are a few unnecessarily long lines in here. I'd wrap them. Otherwise LGTM. Reviewed-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx> > --- > drivers/pci/controller/dwc/pcie-kirin.c | 36 +++++++++---------------- > 1 file changed, 12 insertions(+), 24 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pcie-kirin.c b/drivers/pci/controller/dwc/pcie-kirin.c > index e9bda1746ca5..fc0a71575085 100644 > --- a/drivers/pci/controller/dwc/pcie-kirin.c > +++ b/drivers/pci/controller/dwc/pcie-kirin.c > @@ -216,10 +216,8 @@ static int hi3660_pcie_phy_start(struct hi3660_pcie_phy *phy) > > usleep_range(PIPE_CLK_WAIT_MIN, PIPE_CLK_WAIT_MAX); > reg_val = kirin_apb_phy_readl(phy, PCIE_APB_PHY_STATUS0); > - if (reg_val & PIPE_CLK_STABLE) { > - dev_err(dev, "PIPE clk is not stable\n"); > - return -EINVAL; > - } > + if (reg_val & PIPE_CLK_STABLE) > + return dev_err_probe(dev, -EINVAL, "PIPE clk is not stable\n"); > > return 0; > } > @@ -371,10 +369,8 @@ static int kirin_pcie_get_gpio_enable(struct kirin_pcie *pcie, > if (ret < 0) > return 0; > > - if (ret > MAX_PCI_SLOTS) { > - dev_err(dev, "Too many GPIO clock requests!\n"); > - return -EINVAL; > - } > + if (ret > MAX_PCI_SLOTS) > + return dev_err_probe(dev, -EINVAL, "Too many GPIO clock requests!\n"); > > pcie->n_gpio_clkreq = ret; > > @@ -421,16 +417,12 @@ static int kirin_pcie_parse_port(struct kirin_pcie *pcie, > } > > pcie->num_slots++; > - if (pcie->num_slots > MAX_PCI_SLOTS) { > - dev_err(dev, "Too many PCI slots!\n"); > - return -EINVAL; > - } > + if (pcie->num_slots > MAX_PCI_SLOTS) > + return dev_err_probe(dev, -EINVAL, "Too many PCI slots!\n"); Lines are getting a bit long, I'd wrap after -EINVAL, Same in other cases. > > ret = of_pci_get_devfn(child); > - if (ret < 0) { > - dev_err(dev, "failed to parse devfn: %d\n", ret); > - return ret; > - } > + if (ret < 0) > + return dev_err_probe(dev, ret, "failed to parse devfn\n"); > > slot = PCI_SLOT(ret); >