2 files changed, 15 insertions, 37 deletions

diff --git a/arch/arm64/boot/dts/mediatek/mt2712e.dtsi b/arch/arm64/boot/dts/mediatek/mt2712e.dtsi
index 976d92a94738..43307bad3f0d 100644
--- a/arch/arm64/boot/dts/mediatek/mt2712e.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt2712e.dtsi
@@ -819,7 +819,6 @@
                         #size-cells = <2>;
                         #interrupt-cells = <1>;
                         ranges;
-                        num-lanes = <1>;
                         interrupt-map-mask = <0 0 0 7>;
                         interrupt-map = <0 0 0 1 &pcie_intc0 0>,
                                         <0 0 0 2 &pcie_intc0 1>,
@@ -840,7 +839,6 @@
                         #size-cells = <2>;
                         #interrupt-cells = <1>;
                         ranges;
-                        num-lanes = <1>;
                         interrupt-map-mask = <0 0 0 7>;
                         interrupt-map = <0 0 0 1 &pcie_intc1 0>,
                                         <0 0 0 2 &pcie_intc1 1>,
diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c
index 0b6c72804e03..adb6cb15daa2 100644
--- a/drivers/pci/controller/pcie-mediatek.c
+++ b/drivers/pci/controller/pcie-mediatek.c
@@ -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);