dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-30 23:11:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

lib: fdtdec: Fix whitespace style violations

Browse Source 
Fix some whitespace-related style violations in fdtdec.c.

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Mario Six <mario.six@gdsys.cc>
This commit is contained in:
Mario Six
2018-01-15 11:07:35 +01:00
committed by Simon Glass
parent 29d11b8838
commit 2e38662dc6
1 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
lib/fdtdec.c
View File

@@ -83,8 +83,9 @@ const char *fdtdec_get_compatible(enum fdt_compat_id id)
} }
fdt_addr_t fdtdec_get_addr_size_fixed(const void *blob, int node, fdt_addr_t fdtdec_get_addr_size_fixed(const void *blob, int node,
const char *prop_name, int index, int na, int ns, const char *prop_name, int index, int na,
fdt_size_t *sizep, bool translate) int ns, fdt_size_t *sizep,
bool translate)
{ {
const fdt32_t *prop, *prop_end; const fdt32_t *prop, *prop_end;
const fdt32_t *prop_addr, *prop_size, *prop_after_size; const fdt32_t *prop_addr, *prop_size, *prop_after_size;
@@ -138,8 +139,9 @@ fdt_addr_t fdtdec_get_addr_size_fixed(const void *blob, int node,
} }
fdt_addr_t fdtdec_get_addr_size_auto_parent(const void *blob, int parent, fdt_addr_t fdtdec_get_addr_size_auto_parent(const void *blob, int parent,
int node, const char *prop_name, int index, fdt_size_t *sizep, int node, const char *prop_name,
bool translate) int index, fdt_size_t *sizep,
bool translate)
{ {
int na, ns; int na, ns;
@@ -164,8 +166,9 @@ fdt_addr_t fdtdec_get_addr_size_auto_parent(const void *blob, int parent,
} }
fdt_addr_t fdtdec_get_addr_size_auto_noparent(const void *blob, int node, fdt_addr_t fdtdec_get_addr_size_auto_noparent(const void *blob, int node,
const char *prop_name, int index, fdt_size_t *sizep, const char *prop_name, int index,
bool translate) fdt_size_t *sizep,
bool translate)
{ {
int parent; int parent;
@@ -182,7 +185,7 @@ fdt_addr_t fdtdec_get_addr_size_auto_noparent(const void *blob, int node,
} }
fdt_addr_t fdtdec_get_addr_size(const void *blob, int node, fdt_addr_t fdtdec_get_addr_size(const void *blob, int node,
const char *prop_name, fdt_size_t *sizep) const char *prop_name, fdt_size_t *sizep)
{ {
int ns = sizep ? (sizeof(fdt_size_t) / sizeof(fdt32_t)) : 0; int ns = sizep ? (sizeof(fdt_size_t) / sizeof(fdt32_t)) : 0;
@@ -191,15 +194,14 @@ fdt_addr_t fdtdec_get_addr_size(const void *blob, int node,
ns, sizep, false); ns, sizep, false);
} }
fdt_addr_t fdtdec_get_addr(const void *blob, int node, fdt_addr_t fdtdec_get_addr(const void *blob, int node, const char *prop_name)
const char *prop_name)
{ {
return fdtdec_get_addr_size(blob, node, prop_name, NULL); return fdtdec_get_addr_size(blob, node, prop_name, NULL);
} }
#if defined(CONFIG_PCI) && defined(CONFIG_DM_PCI) #if defined(CONFIG_PCI) && defined(CONFIG_DM_PCI)
int fdtdec_get_pci_addr(const void *blob, int node, enum fdt_pci_space type, int fdtdec_get_pci_addr(const void *blob, int node, enum fdt_pci_space type,
const char *prop_name, struct fdt_pci_addr *addr) const char *prop_name, struct fdt_pci_addr *addr)
{ {
const u32 *cell; const u32 *cell;
int len; int len;
@@ -308,7 +310,7 @@ int fdtdec_get_pci_bar32(struct udevice *dev, struct fdt_pci_addr *addr,
#endif #endif
uint64_t fdtdec_get_uint64(const void *blob, int node, const char *prop_name, uint64_t fdtdec_get_uint64(const void *blob, int node, const char *prop_name,
uint64_t default_val) uint64_t default_val)
{ {
const uint64_t *cell64; const uint64_t *cell64;
int length; int length;
@@ -349,14 +351,13 @@ enum fdt_compat_id fdtdec_lookup(const void *blob, int node)
return COMPAT_UNKNOWN; return COMPAT_UNKNOWN;
} }
int fdtdec_next_compatible(const void *blob, int node, int fdtdec_next_compatible(const void *blob, int node, enum fdt_compat_id id)
enum fdt_compat_id id)
{ {
return fdt_node_offset_by_compatible(blob, node, compat_names[id]); return fdt_node_offset_by_compatible(blob, node, compat_names[id]);
} }
int fdtdec_next_compatible_subnode(const void *blob, int node, int fdtdec_next_compatible_subnode(const void *blob, int node,
enum fdt_compat_id id, int *depthp) enum fdt_compat_id id, int *depthp)
{ {
do { do {
node = fdt_next_node(blob, node, depthp); node = fdt_next_node(blob, node, depthp);
@@ -370,8 +371,8 @@ int fdtdec_next_compatible_subnode(const void *blob, int node,
return -FDT_ERR_NOTFOUND; return -FDT_ERR_NOTFOUND;
} }
int fdtdec_next_alias(const void *blob, const char *name, int fdtdec_next_alias(const void *blob, const char *name, enum fdt_compat_id id,
enum fdt_compat_id id, int *upto) int *upto)
{ {
#define MAX_STR_LEN 20 #define MAX_STR_LEN 20
char str[MAX_STR_LEN + 20]; char str[MAX_STR_LEN + 20];
@@ -393,7 +394,8 @@ int fdtdec_next_alias(const void *blob, const char *name,
} }
int fdtdec_find_aliases_for_id(const void *blob, const char *name, int fdtdec_find_aliases_for_id(const void *blob, const char *name,
enum fdt_compat_id id, int *node_list, int maxcount) enum fdt_compat_id id, int *node_list,
int maxcount)
{ {
memset(node_list, '\0', sizeof(*node_list) * maxcount); memset(node_list, '\0', sizeof(*node_list) * maxcount);
@@ -402,7 +404,8 @@ int fdtdec_find_aliases_for_id(const void *blob, const char *name,
/* TODO: Can we tighten this code up a little? */ /* TODO: Can we tighten this code up a little? */
int fdtdec_add_aliases_for_id(const void *blob, const char *name, int fdtdec_add_aliases_for_id(const void *blob, const char *name,
enum fdt_compat_id id, int *node_list, int maxcount) enum fdt_compat_id id, int *node_list,
int maxcount)
{ {
int name_len = strlen(name); int name_len = strlen(name);
int nodes[maxcount]; int nodes[maxcount];
@@ -429,7 +432,7 @@ int fdtdec_add_aliases_for_id(const void *blob, const char *name,
} }
if (node >= 0) if (node >= 0)
debug("%s: warning: maxcount exceeded with alias '%s'\n", debug("%s: warning: maxcount exceeded with alias '%s'\n",
__func__, name); __func__, name);
/* Now find all the aliases */ /* Now find all the aliases */
for (offset = fdt_first_property_offset(blob, alias_node); for (offset = fdt_first_property_offset(blob, alias_node);
@@ -452,7 +455,7 @@ int fdtdec_add_aliases_for_id(const void *blob, const char *name,
number = simple_strtoul(path + name_len, NULL, 10); number = simple_strtoul(path + name_len, NULL, 10);
if (number < 0 || number >= maxcount) { if (number < 0 || number >= maxcount) {
debug("%s: warning: alias '%s' is out of range\n", debug("%s: warning: alias '%s' is out of range\n",
__func__, path); __func__, path);
continue; continue;
} }
@@ -498,7 +501,7 @@ int fdtdec_add_aliases_for_id(const void *blob, const char *name,
if (!node_list[i]) { if (!node_list[i]) {
for (; j < maxcount; j++) for (; j < maxcount; j++)
if (nodes[j] && if (nodes[j] &&
fdtdec_get_is_enabled(blob, nodes[j])) fdtdec_get_is_enabled(blob, nodes[j]))
break; break;
/* Have we run out of nodes to add? */ /* Have we run out of nodes to add? */
@@ -641,7 +644,8 @@ int fdtdec_lookup_phandle(const void *blob, int node, const char *prop_name)
* @return pointer to cell, which is only valid if err == 0 * @return pointer to cell, which is only valid if err == 0
*/ */
static const void *get_prop_check_min_len(const void *blob, int node, static const void *get_prop_check_min_len(const void *blob, int node,
const char *prop_name, int min_len, int *err) const char *prop_name, int min_len,
int *err)
{ {
const void *cell; const void *cell;
int len; int len;
@@ -658,7 +662,7 @@ static const void *get_prop_check_min_len(const void *blob, int node,
} }
int fdtdec_get_int_array(const void *blob, int node, const char *prop_name, int fdtdec_get_int_array(const void *blob, int node, const char *prop_name,
u32 *array, int count) u32 *array, int count)
{ {
const u32 *cell; const u32 *cell;
int i, err = 0; int i, err = 0;
@@ -850,7 +854,7 @@ int fdtdec_get_child_count(const void *blob, int node)
} }
int fdtdec_get_byte_array(const void *blob, int node, const char *prop_name, int fdtdec_get_byte_array(const void *blob, int node, const char *prop_name,
u8 *array, int count) u8 *array, int count)
{ {
const u8 *cell; const u8 *cell;
int err; int err;
@@ -862,7 +866,7 @@ int fdtdec_get_byte_array(const void *blob, int node, const char *prop_name,
} }
const u8 *fdtdec_locate_byte_array(const void *blob, int node, const u8 *fdtdec_locate_byte_array(const void *blob, int node,
const char *prop_name, int count) const char *prop_name, int count)
{ {
const u8 *cell; const u8 *cell;
int err; int err;
@@ -874,7 +878,7 @@ const u8 *fdtdec_locate_byte_array(const void *blob, int node,
} }
int fdtdec_get_config_int(const void *blob, const char *prop_name, int fdtdec_get_config_int(const void *blob, const char *prop_name,
int default_val) int default_val)
{ {
int config_node; int config_node;