LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Sriram Dash 2016-04-05 14:41:22 +05:30 committed by Marek Vasut
parent b9f6786a88
commit 47435e5b18
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/usb/common/fsl-dt-fixup.c
View File

@ -26,23 +26,24 @@ static const char * const compat_usb_fsl[] = {
NULL NULL
}; };
static const char *fdt_usb_get_node_type(void *blob, int start_offset, static int fdt_usb_get_node_type(void *blob, int start_offset,
int *node_offset) int *node_offset, const char **node_type)
{ {
const char *node_type = NULL;
int i; int i;
int ret = -ENOENT;
for (i = 0; compat_usb_fsl[i]; i++) { for (i = 0; compat_usb_fsl[i]; i++) {
*node_offset = fdt_node_offset_by_compatible *node_offset = fdt_node_offset_by_compatible
(blob, start_offset, (blob, start_offset,
compat_usb_fsl[i]); compat_usb_fsl[i]);
if (*node_offset >= 0) { if (*node_offset >= 0) {
node_type = compat_usb_fsl[i]; *node_type = compat_usb_fsl[i];
ret = 0;
break; break;
} }
} }
return node_type; return ret;
} }
static int fdt_fixup_usb_mode_phy_type(void *blob, const char *mode, 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 node_offset;
int err; int err;
node_type = fdt_usb_get_node_type(blob, start_offset, &node_offset); err = fdt_usb_get_node_type(blob, start_offset,
if (!node_type) &node_offset, &node_type);
return -1; if (err < 0)
return err;
if (mode) { if (mode) {
err = fdt_setprop(blob, node_offset, prop_mode, 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; int node_offset, err;
const char *node_type = NULL; const char *node_type = NULL;
node_type = fdt_usb_get_node_type(blob, start_offset, &node_offset); err = fdt_usb_get_node_type(blob, start_offset,
if (!node_type) &node_offset, &node_type);
return -1; if (err < 0)
return err;
err = fdt_setprop(blob, node_offset, prop_erratum, NULL, 0); err = fdt_setprop(blob, node_offset, prop_erratum, NULL, 0);
if (err < 0) { if (err < 0) {