From c609775e6fe6ce70d8ad3e244440b42fbf66bc13 Mon Sep 17 00:00:00 2001
From: Sriram Dash <sriram.dash@nxp.com>
Date: Fri, 16 Sep 2016 17:12:16 +0530
Subject: [PATCH] usb: fsl: Renaming fdt_fixup_erratum and
fdt_fixup_usb_erratum
The functions fdt_fixup_erratum and fdt_fixup_usb_erratum are
fsl/nxp specific. So, make them explicit by renaming them
fsl_fdt_fixup_erratum and fsl_fdt_fixup_usb_erratum
Signed-off-by: Sriram Dash <sriram.dash@nxp.com>
---
drivers/usb/common/fsl-dt-fixup.c | 45 ++++++++++++++++---------------
1 file changed, 23 insertions(+), 22 deletions(-)
diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c
index 906f9df5d8..63a24f74ad 100644
--- a/drivers/usb/common/fsl-dt-fixup.c
+++ b/drivers/usb/common/fsl-dt-fixup.c
@@ -86,8 +86,9 @@ static int fdt_fixup_usb_mode_phy_type(void *blob, const char *mode,
return node_offset;
}
-static int fdt_fixup_usb_erratum(void *blob, const char *prop_erratum,
- const char *controller_type, int start_offset)
+static int fsl_fdt_fixup_usb_erratum(void *blob, const char *prop_erratum,
+ const char *controller_type,
+ int start_offset)
{
int node_offset, err;
const char *node_type = NULL;
@@ -114,17 +115,17 @@ static int fdt_fixup_usb_erratum(void *blob, const char *prop_erratum,
return node_offset;
}
-static int fdt_fixup_erratum(int *usb_erratum_off, void *blob,
- const char *controller_type, char *str,
- bool (*has_erratum)(void))
+static int fsl_fdt_fixup_erratum(int *usb_erratum_off, void *blob,
+ const char *controller_type, char *str,
+ bool (*has_erratum)(void))
{
char buf[32] = {0};
snprintf(buf, sizeof(buf), "fsl,usb-erratum-%s", str);
if (!has_erratum())
return -EINVAL;
- *usb_erratum_off = fdt_fixup_usb_erratum(blob, buf, controller_type,
- *usb_erratum_off);
+ *usb_erratum_off = fsl_fdt_fixup_usb_erratum(blob, buf, controller_type,
+ *usb_erratum_off);
if (*usb_erratum_off < 0)
return -ENOSPC;
debug("Adding USB erratum %s\n", str);
@@ -198,29 +199,29 @@ void fsl_fdt_fixup_dr_usb(void *blob, bd_t *bd)
if (usb_phy_off < 0)
return;
- ret = fdt_fixup_erratum(&usb_erratum_a006261_off, blob,
- CHIPIDEA_USB2, "a006261",
- has_erratum_a006261);
+ ret = fsl_fdt_fixup_erratum(&usb_erratum_a006261_off, blob,
+ CHIPIDEA_USB2, "a006261",
+ has_erratum_a006261);
if (ret == -ENOSPC)
return;
- ret = fdt_fixup_erratum(&usb_erratum_a007075_off, blob,
- CHIPIDEA_USB2, "a007075",
- has_erratum_a007075);
+ ret = fsl_fdt_fixup_erratum(&usb_erratum_a007075_off, blob,
+ CHIPIDEA_USB2, "a007075",
+ has_erratum_a007075);
if (ret == -ENOSPC)
return;
- ret = fdt_fixup_erratum(&usb_erratum_a007792_off, blob,
- CHIPIDEA_USB2, "a007792",
- has_erratum_a007792);
+ ret = fsl_fdt_fixup_erratum(&usb_erratum_a007792_off, blob,
+ CHIPIDEA_USB2, "a007792",
+ has_erratum_a007792);
if (ret == -ENOSPC)
return;
- ret = fdt_fixup_erratum(&usb_erratum_a005697_off, blob,
- CHIPIDEA_USB2, "a005697",
- has_erratum_a005697);
+ ret = fsl_fdt_fixup_erratum(&usb_erratum_a005697_off, blob,
+ CHIPIDEA_USB2, "a005697",
+ has_erratum_a005697);
if (ret == -ENOSPC)
return;
- ret = fdt_fixup_erratum(&usb_erratum_a008751_off, blob,
- SNPS_DWC3, "a008751",
- has_erratum_a008751);
+ ret = fsl_fdt_fixup_erratum(&usb_erratum_a008751_off, blob,
+ SNPS_DWC3, "a008751",
+ has_erratum_a008751);
if (ret == -ENOSPC)
return;
--
2.39.5