Use int as it is native (and widely used) return type.
Signed-off-by: Sriram Dash sriram.dash@nxp.com Signed-off-by: Rajesh Bhagat rajesh.bhagat@nxp.com --- Changes in v5: - Modified title and description - Using error codes for return type.
drivers/usb/common/fsl-dt-fixup.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c index 13f9fb8..7183b80 100644 --- a/drivers/usb/common/fsl-dt-fixup.c +++ b/drivers/usb/common/fsl-dt-fixup.c @@ -25,11 +25,11 @@ static const char compat_usb_fsl[] = { "snps,dwc3" "\0" };
-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; const char *node_name, *nxt; + int ret = -ENOENT;
for (node_name = compat_usb_fsl; *node_name; node_name = nxt + 1) { nxt = node_name; @@ -38,12 +38,13 @@ static const char *fdt_usb_get_node_type(void *blob, int start_offset, *node_offset = fdt_node_offset_by_compatible (blob, start_offset, node_name); if (*node_offset >= 0) { - node_type = node_name; + *node_type = node_name; + ret = 0; break; } }
- return node_type; + return ret; }
static int fdt_fixup_usb_mode_phy_type(void *blob, const char *mode, @@ -55,9 +56,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, @@ -84,9 +86,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) {