summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSriram Dash <sriram.dash@nxp.com>2016-04-05 14:41:22 +0530
committerMarek Vasut <marex@denx.de>2016-04-10 17:18:43 +0200
commit47435e5b18e3dd780a37e39a5f34e6d46e1e2126 (patch)
treed9abe13ac24e83013b63f002e85c31d703d494cf
parentb9f6786a885ef5da741176b0b3411434b57e5019 (diff)
downloadtalos-obmc-uboot-47435e5b18e3dd780a37e39a5f34e6d46e1e2126.tar.gz
talos-obmc-uboot-47435e5b18e3dd780a37e39a5f34e6d46e1e2126.zip
drivers:usb:common:fsl-dt-fixup: fix return value of fdt_usb_get_node_type
Changes the return type of fdt_usb_get_node_type from char* to int Signed-off-by: Sriram Dash <sriram.dash@nxp.com> Signed-off-by: Rajesh Bhagat <rajesh.bhagat@nxp.com>
-rw-r--r--drivers/usb/common/fsl-dt-fixup.c25
1 files changed, 14 insertions, 11 deletions
diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c
index 46488dcdcd..6f31932c37 100644
--- a/drivers/usb/common/fsl-dt-fixup.c
+++ b/drivers/usb/common/fsl-dt-fixup.c
@@ -26,23 +26,24 @@ static const char * const compat_usb_fsl[] = {
NULL
};
-static const char *fdt_usb_get_node_type(void *blob, int start_offset,
- int *node_offset)
+static int fdt_usb_get_node_type(void *blob, int start_offset,
+ int *node_offset, const char **node_type)
{
- const char *node_type = NULL;
int i;
+ int ret = -ENOENT;
for (i = 0; compat_usb_fsl[i]; i++) {
*node_offset = fdt_node_offset_by_compatible
(blob, start_offset,
compat_usb_fsl[i]);
if (*node_offset >= 0) {
- node_type = compat_usb_fsl[i];
+ *node_type = compat_usb_fsl[i];
+ ret = 0;
break;
}
}
- return node_type;
+ return ret;
}
static int fdt_fixup_usb_mode_phy_type(void *blob, const char *mode,
@@ -54,9 +55,10 @@ static int fdt_fixup_usb_mode_phy_type(void *blob, const char *mode,
int node_offset;
int err;
- node_type = fdt_usb_get_node_type(blob, start_offset, &node_offset);
- if (!node_type)
- return -1;
+ err = fdt_usb_get_node_type(blob, start_offset,
+ &node_offset, &node_type);
+ if (err < 0)
+ return err;
if (mode) {
err = fdt_setprop(blob, node_offset, prop_mode, mode,
@@ -83,9 +85,10 @@ static int fdt_fixup_usb_erratum(void *blob, const char *prop_erratum,
int node_offset, err;
const char *node_type = NULL;
- node_type = fdt_usb_get_node_type(blob, start_offset, &node_offset);
- if (!node_type)
- return -1;
+ err = fdt_usb_get_node_type(blob, start_offset,
+ &node_offset, &node_type);
+ if (err < 0)
+ return err;
err = fdt_setprop(blob, node_offset, prop_erratum, NULL, 0);
if (err < 0) {
OpenPOWER on IntegriCloud