commit 66d68363b36acc0c19ef9237527e4e32a0e8786f
author Tim Harvey <tharvey@gateworks.com> Thu Jul 13 11:56:08 2023 -0700
committer Marek Vasut <marex@denx.de> Fri Aug 25 02:36:19 2023 +0200
tree 25849eccc5a630b9896d69fe8cb4b8b6a34aca41
parent 3841672c4d2d31870467c372ba4736aa30495395

phy: phy-imx8mq-usb: clean up clock code

use CONFIG_IS_ENABLED for clock enable/disable and change printf's
to dev_err. Additionlly remove the comment that does not make sense.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Reviewed-by: Marek Vasut <marex@denx.de>

drivers/phy/phy-imx8mq-usb.c

diff --git a/drivers/phy/phy-imx8mq-usb.c b/drivers/phy/phy-imx8mq-usb.c
index 9fa78ef..b660ead 100644
--- a/drivers/phy/phy-imx8mq-usb.c
+++ b/drivers/phy/phy-imx8mq-usb.c
@@ -78,9 +78,7 @@
 };
 
 struct imx8mq_usb_phy {
-#if CONFIG_IS_ENABLED(CLK)
 	struct clk phy_clk;
-#endif
 	void __iomem *base;
 	enum imx8mpq_phy_type type;
 	struct udevice *vbus_supply;
@@ -178,13 +176,13 @@
 	u32 value;
 	int ret;
 
-#if CONFIG_IS_ENABLED(CLK)
-	ret = clk_enable(&imx_phy->phy_clk);
-	if (ret) {
-		printf("Failed to enable usb phy clock\n");
-		return ret;
+	if (CONFIG_IS_ENABLED(CLK)) {
+		ret = clk_enable(&imx_phy->phy_clk);
+		if (ret) {
+			dev_err(dev, "Failed to enable usb phy clock: %d\n", ret);
+			return ret;
+		}
 	}
-#endif
 
 	if (CONFIG_IS_ENABLED(DM_REGULATOR) && imx_phy->vbus_supply) {
 		ret = regulator_set_enable_if_allowed(imx_phy->vbus_supply, true);
@@ -202,9 +200,8 @@
 	return 0;
 
 err:
-#if CONFIG_IS_ENABLED(CLK)
-	clk_disable(&imx_phy->phy_clk);
-#endif
+	if (CONFIG_IS_ENABLED(CLK))
+		clk_disable(&imx_phy->phy_clk);
 	return ret;
 }
 
@@ -220,9 +217,8 @@
 	value |= PHY_CTRL6_RXTERM_OVERRIDE_SEL;
 	writel(value, imx_phy->base + PHY_CTRL6);
 
-#if CONFIG_IS_ENABLED(CLK)
-	clk_disable(&imx_phy->phy_clk);
-#endif
+	if (CONFIG_IS_ENABLED(CLK))
+		clk_disable(&imx_phy->phy_clk);
 
 	if (CONFIG_IS_ENABLED(DM_REGULATOR) && imx_phy->vbus_supply) {
 		ret = regulator_set_enable_if_allowed(imx_phy->vbus_supply, false);
@@ -258,14 +254,14 @@
 	if (!priv->base)
 		return -EINVAL;
 
-#if CONFIG_IS_ENABLED(CLK)
-	/* Assigned clock already set clock */
-	ret = clk_get_by_name(dev, "phy", &priv->phy_clk);
-	if (ret) {
-		printf("Failed to get usb phy clock\n");
-		return ret;
+	if (CONFIG_IS_ENABLED(CLK)) {
+		ret = clk_get_by_name(dev, "phy", &priv->phy_clk);
+		if (ret) {
+			dev_err(dev, "Failed to get usb phy clock %d\n", ret);
+			return ret;
+		}
 	}
-#endif
+
 	if (CONFIG_IS_ENABLED(DM_REGULATOR)) {
 		ret = device_get_supply_regulator(dev, "vbus-supply",
 						  &priv->vbus_supply);