PCI: mediatek: Get optional clocks with devm_clk_get_optional()
authorChunfeng Yun <chunfeng.yun@mediatek.com>
Wed, 10 Apr 2019 06:54:16 +0000 (14:54 +0800)
committerLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Thu, 11 Apr 2019 08:56:01 +0000 (09:56 +0100)
Update the driver to use devm_clk_get_optional() to claim
optional clocks instead of devm_clk_get().

Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Ryder Lee <ryder.lee@mediatek.com>
Acked-by: Honghui Zhang <honghui.zhang@mediatek.com>
Cc: Ryder Lee <ryder.lee@mediatek.com>
Cc: Honghui Zhang <honghui.zhang@mediatek.com>
drivers/pci/controller/pcie-mediatek.c

index 0b6c72804e03b77816c7bef286d7e350651c38d4..adb6cb15daa29328d659558393a553bd5352a04c 100644 (file)
@@ -915,49 +915,29 @@ 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);
+       if (IS_ERR(port->axi_ck))
+               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);
+       if (IS_ERR(port->aux_ck))
+               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);
+       if (IS_ERR(port->obff_ck))
+               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);
+       if (IS_ERR(port->pipe_ck))
+               return PTR_ERR(port->pipe_ck);
 
        snprintf(name, sizeof(name), "pcie-rst%d", slot);
        port->reset = devm_reset_control_get_optional_exclusive(dev, name);