summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChunfeng Yun <chunfeng.yun@mediatek.com>2019-04-10 02:54:16 -0400
committerLorenzo Pieralisi <lorenzo.pieralisi@arm.com>2019-04-11 04:56:01 -0400
commit6be22343cc546b46402869668da453d56921c14e (patch)
treed8300a19e82464fd275e3672e132ab5bddb7e7a8
parent9e98c678c2d6ae3a17cb2de55d17f69dddaa231b (diff)
PCI: mediatek: Get optional clocks with devm_clk_get_optional()
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>
-rw-r--r--drivers/pci/controller/pcie-mediatek.c50
1 files changed, 15 insertions, 35 deletions
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,
915 915
916 /* sys_ck might be divided into the following parts in some chips */ 916 /* sys_ck might be divided into the following parts in some chips */
917 snprintf(name, sizeof(name), "ahb_ck%d", slot); 917 snprintf(name, sizeof(name), "ahb_ck%d", slot);
918 port->ahb_ck = devm_clk_get(dev, name); 918 port->ahb_ck = devm_clk_get_optional(dev, name);
919 if (IS_ERR(port->ahb_ck)) { 919 if (IS_ERR(port->ahb_ck))
920 if (PTR_ERR(port->ahb_ck) == -EPROBE_DEFER) 920 return PTR_ERR(port->ahb_ck);
921 return -EPROBE_DEFER;
922
923 port->ahb_ck = NULL;
924 }
925 921
926 snprintf(name, sizeof(name), "axi_ck%d", slot); 922 snprintf(name, sizeof(name), "axi_ck%d", slot);
927 port->axi_ck = devm_clk_get(dev, name); 923 port->axi_ck = devm_clk_get_optional(dev, name);
928 if (IS_ERR(port->axi_ck)) { 924 if (IS_ERR(port->axi_ck))
929 if (PTR_ERR(port->axi_ck) == -EPROBE_DEFER) 925 return PTR_ERR(port->axi_ck);
930 return -EPROBE_DEFER;
931
932 port->axi_ck = NULL;
933 }
934 926
935 snprintf(name, sizeof(name), "aux_ck%d", slot); 927 snprintf(name, sizeof(name), "aux_ck%d", slot);
936 port->aux_ck = devm_clk_get(dev, name); 928 port->aux_ck = devm_clk_get_optional(dev, name);
937 if (IS_ERR(port->aux_ck)) { 929 if (IS_ERR(port->aux_ck))
938 if (PTR_ERR(port->aux_ck) == -EPROBE_DEFER) 930 return PTR_ERR(port->aux_ck);
939 return -EPROBE_DEFER;
940
941 port->aux_ck = NULL;
942 }
943 931
944 snprintf(name, sizeof(name), "obff_ck%d", slot); 932 snprintf(name, sizeof(name), "obff_ck%d", slot);
945 port->obff_ck = devm_clk_get(dev, name); 933 port->obff_ck = devm_clk_get_optional(dev, name);
946 if (IS_ERR(port->obff_ck)) { 934 if (IS_ERR(port->obff_ck))
947 if (PTR_ERR(port->obff_ck) == -EPROBE_DEFER) 935 return PTR_ERR(port->obff_ck);
948 return -EPROBE_DEFER;
949
950 port->obff_ck = NULL;
951 }
952 936
953 snprintf(name, sizeof(name), "pipe_ck%d", slot); 937 snprintf(name, sizeof(name), "pipe_ck%d", slot);
954 port->pipe_ck = devm_clk_get(dev, name); 938 port->pipe_ck = devm_clk_get_optional(dev, name);
955 if (IS_ERR(port->pipe_ck)) { 939 if (IS_ERR(port->pipe_ck))
956 if (PTR_ERR(port->pipe_ck) == -EPROBE_DEFER) 940 return PTR_ERR(port->pipe_ck);
957 return -EPROBE_DEFER;
958
959 port->pipe_ck = NULL;
960 }
961 941
962 snprintf(name, sizeof(name), "pcie-rst%d", slot); 942 snprintf(name, sizeof(name), "pcie-rst%d", slot);
963 port->reset = devm_reset_control_get_optional_exclusive(dev, name); 943 port->reset = devm_reset_control_get_optional_exclusive(dev, name);