Hi Ryder,
On Sun, 2019-03-31 at 18:10 +0800, Ryder Lee wrote:
> On Sat, 2019-03-30 at 18:00 +0800, Chunfeng Yun wrote:
> > Use devm_clk_get_optional() to get optional clock
> >
> > Signed-off-by: Chunfeng Yun <chunfeng.yun@xxxxxxxxxxxx>
> > ---
> > drivers/pci/controller/pcie-mediatek.c | 46 ++++++--------------------
> > 1 file changed, 11 insertions(+), 35 deletions(-)
> >
> > diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c
> > index 0b6c72804e03..9a66a018489b 100644
> > --- a/drivers/pci/controller/pcie-mediatek.c
> > +++ b/drivers/pci/controller/pcie-mediatek.c
> > @@ -915,49 +915,25 @@ static int mtk_pcie_parse_port(struct mtk_pcie *pcie,
> >
> > /* sys_ck might be divided into the following parts in some chips */
> > snprintf(name, sizeof(name), "ahb_ck%d", slot);
> > - port->ahb_ck = devm_clk_get(dev, name);
> > - if (IS_ERR(port->ahb_ck)) {
> > - if (PTR_ERR(port->ahb_ck) == -EPROBE_DEFER)
> > - return -EPROBE_DEFER;
> > -
> > - port->ahb_ck = NULL;
> > - }
> > + port->ahb_ck = devm_clk_get_optional(dev, name);
> > + if (IS_ERR(port->ahb_ck))
> > + return PTR_ERR(port->ahb_ck);
> >
> > snprintf(name, sizeof(name), "axi_ck%d", slot);
> > - port->axi_ck = devm_clk_get(dev, name);
> > - if (IS_ERR(port->axi_ck)) {
> > - if (PTR_ERR(port->axi_ck) == -EPROBE_DEFER)
> > - return -EPROBE_DEFER;
> > -
> > - port->axi_ck = NULL;
> > - }
> > + port->axi_ck = devm_clk_get_optional(dev, name);
> > + return PTR_ERR(port->axi_ck);
> >
> > snprintf(name, sizeof(name), "aux_ck%d", slot);
> > - port->aux_ck = devm_clk_get(dev, name);
> > - if (IS_ERR(port->aux_ck)) {
> > - if (PTR_ERR(port->aux_ck) == -EPROBE_DEFER)
> > - return -EPROBE_DEFER;
> > -
> > - port->aux_ck = NULL;
> > - }
> > + port->aux_ck = devm_clk_get_optional(dev, name);
> > + return PTR_ERR(port->aux_ck);
> >
> > snprintf(name, sizeof(name), "obff_ck%d", slot);
> > - port->obff_ck = devm_clk_get(dev, name);
> > - if (IS_ERR(port->obff_ck)) {
> > - if (PTR_ERR(port->obff_ck) == -EPROBE_DEFER)
> > - return -EPROBE_DEFER;
> > -
> > - port->obff_ck = NULL;
> > - }
> > + port->obff_ck = devm_clk_get_optional(dev, name);
> > + return PTR_ERR(port->obff_ck);
> >
> > snprintf(name, sizeof(name), "pipe_ck%d", slot);
> > - port->pipe_ck = devm_clk_get(dev, name);
> > - if (IS_ERR(port->pipe_ck)) {
> > - if (PTR_ERR(port->pipe_ck) == -EPROBE_DEFER)
> > - return -EPROBE_DEFER;
> > -
> > - port->pipe_ck = NULL;
> > - }
> > + port->pipe_ck = devm_clk_get_optional(dev, name);
> > + return PTR_ERR(port->pipe_ck);
> >
> > snprintf(name, sizeof(name), "pcie-rst%d", slot);
> > port->reset = devm_reset_control_get_optional_exclusive(dev, name);
>
> if (IS_ERR(...)) ?
Very sorry for my stupid mistake:(
will send new version
>
