usb: phy: tegra: Cleanup error messages

Tegra's PHY driver has a mix of pr_err() and dev_err(), let's switch to
dev_err() and use common errors message formatting across the driver for
consistency.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 41 insertions, 28 deletions

diff --git a/drivers/usb/phy/phy-tegra-usb.c b/drivers/usb/phy/phy-tegra-usb.c
index 0e8d23e51732..e46219e7fa93 100644
--- a/drivers/usb/phy/phy-tegra-usb.c
+++ b/drivers/usb/phy/phy-tegra-usb.c
@@ -236,10 +236,14 @@ static void set_phcd(struct tegra_usb_phy *phy, bool enable)
 
 static int utmip_pad_open(struct tegra_usb_phy *phy)
 {
+        int err;
+
         phy->pad_clk = devm_clk_get(phy->u_phy.dev, "utmi-pads");
         if (IS_ERR(phy->pad_clk)) {
-                pr_err("%s: can't get utmip pad clock\n", __func__);
-                return PTR_ERR(phy->pad_clk);
+                err = PTR_ERR(phy->pad_clk);
+                dev_err(phy->u_phy.dev,
+                        "Failed to get UTMIP pad clock: %d\n", err);
+                return err;
         }
 
         return 0;
@@ -282,7 +286,7 @@ static int utmip_pad_power_off(struct tegra_usb_phy *phy)
         void __iomem *base = phy->pad_regs;
 
         if (!utmip_pad_count) {
-                pr_err("%s: utmip pad already powered off\n", __func__);
+                dev_err(phy->u_phy.dev, "UTMIP pad already powered off\n");
                 return -EINVAL;
         }
 
@@ -338,7 +342,8 @@ static void utmi_phy_clk_disable(struct tegra_usb_phy *phy)
                 set_phcd(phy, true);
 
         if (utmi_wait_register(base + USB_SUSP_CTRL, USB_PHY_CLK_VALID, 0) < 0)
-                pr_err("%s: timeout waiting for phy to stabilize\n", __func__);
+                dev_err(phy->u_phy.dev,
+                        "Timeout waiting for PHY to stabilize on disable\n");
 }
 
 static void utmi_phy_clk_enable(struct tegra_usb_phy *phy)
@@ -370,7 +375,8 @@ static void utmi_phy_clk_enable(struct tegra_usb_phy *phy)
 
         if (utmi_wait_register(base + USB_SUSP_CTRL, USB_PHY_CLK_VALID,
                                                      USB_PHY_CLK_VALID))
-                pr_err("%s: timeout waiting for phy to stabilize\n", __func__);
+                dev_err(phy->u_phy.dev,
+                        "Timeout waiting for PHY to stabilize on enable\n");
 }
 
 static int utmi_phy_power_on(struct tegra_usb_phy *phy)
@@ -617,15 +623,15 @@ static int ulpi_phy_power_on(struct tegra_usb_phy *phy)
 
         ret = gpio_direction_output(phy->reset_gpio, 0);
         if (ret < 0) {
-                dev_err(phy->u_phy.dev, "gpio %d not set to 0\n",
-                        phy->reset_gpio);
+                dev_err(phy->u_phy.dev, "GPIO %d not set to 0: %d\n",
+                        phy->reset_gpio, ret);
                 return ret;
         }
         msleep(5);
         ret = gpio_direction_output(phy->reset_gpio, 1);
         if (ret < 0) {
-                dev_err(phy->u_phy.dev, "gpio %d not set to 1\n",
-                        phy->reset_gpio);
+                dev_err(phy->u_phy.dev, "GPIO %d not set to 1: %d\n",
+                        phy->reset_gpio, ret);
                 return ret;
         }
 
@@ -661,13 +667,13 @@ static int ulpi_phy_power_on(struct tegra_usb_phy *phy)
         /* Fix VbusInvalid due to floating VBUS */
         ret = usb_phy_io_write(phy->ulpi, 0x40, 0x08);
         if (ret) {
-                pr_err("%s: ulpi write failed\n", __func__);
+                dev_err(phy->u_phy.dev, "ULPI write failed: %d\n", ret);
                 return ret;
         }
 
         ret = usb_phy_io_write(phy->ulpi, 0x80, 0x0B);
         if (ret) {
-                pr_err("%s: ulpi write failed\n", __func__);
+                dev_err(phy->u_phy.dev, "ULPI write failed: %d\n", ret);
                 return ret;
         }
 
@@ -728,28 +734,30 @@ static int ulpi_open(struct tegra_usb_phy *phy)
 
         phy->clk = devm_clk_get(phy->u_phy.dev, "ulpi-link");
         if (IS_ERR(phy->clk)) {
-                pr_err("%s: can't get ulpi clock\n", __func__);
-                return PTR_ERR(phy->clk);
+                err = PTR_ERR(phy->clk);
+                dev_err(phy->u_phy.dev, "Failed to get ULPI clock: %d\n", err);
+                return err;
         }
 
         err = devm_gpio_request(phy->u_phy.dev, phy->reset_gpio,
                 "ulpi_phy_reset_b");
         if (err < 0) {
-                dev_err(phy->u_phy.dev, "request failed for gpio: %d\n",
-                       phy->reset_gpio);
+                dev_err(phy->u_phy.dev, "Request failed for GPIO %d: %d\n",
+                        phy->reset_gpio, err);
                 return err;
         }
 
         err = gpio_direction_output(phy->reset_gpio, 0);
         if (err < 0) {
-                dev_err(phy->u_phy.dev, "gpio %d direction not set to output\n",
-                       phy->reset_gpio);
+                dev_err(phy->u_phy.dev,
+                        "GPIO %d direction not set to output: %d\n",
+                        phy->reset_gpio, err);
                 return err;
         }
 
         phy->ulpi = otg_ulpi_create(&ulpi_viewport_access_ops, 0);
         if (!phy->ulpi) {
-                dev_err(phy->u_phy.dev, "otg_ulpi_create returned NULL\n");
+                dev_err(phy->u_phy.dev, "Failed to create ULPI OTG\n");
                 err = -ENOMEM;
                 return err;
         }
@@ -766,8 +774,10 @@ static int tegra_usb_phy_init(struct tegra_usb_phy *phy)
 
         phy->pll_u = devm_clk_get(phy->u_phy.dev, "pll_u");
         if (IS_ERR(phy->pll_u)) {
-                pr_err("Can't get pll_u clock\n");
-                return PTR_ERR(phy->pll_u);
+                err = PTR_ERR(phy->pll_u);
+                dev_err(phy->u_phy.dev,
+                        "Failed to get pll_u clock: %d\n", err);
+                return err;
         }
 
         err = clk_prepare_enable(phy->pll_u);
@@ -782,7 +792,8 @@ static int tegra_usb_phy_init(struct tegra_usb_phy *phy)
                 }
         }
         if (!phy->freq) {
-                pr_err("invalid pll_u parent rate %ld\n", parent_rate);
+                dev_err(phy->u_phy.dev, "Invalid pll_u parent rate %ld\n",
+                        parent_rate);
                 err = -EINVAL;
                 goto fail;
         }
@@ -791,7 +802,7 @@ static int tegra_usb_phy_init(struct tegra_usb_phy *phy)
                 err = regulator_enable(phy->vbus);
                 if (err) {
                         dev_err(phy->u_phy.dev,
-                                "failed to enable usb vbus regulator: %d\n",
+                                "Failed to enable USB VBUS regulator: %d\n",
                                 err);
                         goto fail;
                 }
@@ -855,7 +866,8 @@ static int read_utmi_param(struct platform_device *pdev, const char *param,
         int err = of_property_read_u32(pdev->dev.of_node, param, &value);
         *dest = (u8)value;
         if (err < 0)
-                dev_err(&pdev->dev, "Failed to read USB UTMI parameter %s: %d\n",
+                dev_err(&pdev->dev,
+                        "Failed to read USB UTMI parameter %s: %d\n",
                         param, err);