Cleanup coding errors in arch/powerpc/platforms/ps3/repository.c as
reported by sparse and checkpatch.
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
};
#define dump_field(_a, _b) _dump_field(_a, _b, __func__, __LINE__)
};
#define dump_field(_a, _b) _dump_field(_a, _b, __func__, __LINE__)
-static void _dump_field(const char *hdr, u64 n, const char* func, int line)
+static void _dump_field(const char *hdr, u64 n, const char *func, int line)
{
#if defined(DEBUG)
char s[16];
{
#if defined(DEBUG)
char s[16];
#define dump_node_name(_a, _b, _c, _d, _e) \
_dump_node_name(_a, _b, _c, _d, _e, __func__, __LINE__)
#define dump_node_name(_a, _b, _c, _d, _e) \
_dump_node_name(_a, _b, _c, _d, _e, __func__, __LINE__)
-static void _dump_node_name (unsigned int lpar_id, u64 n1, u64 n2, u64 n3,
- u64 n4, const char* func, int line)
+static void _dump_node_name(unsigned int lpar_id, u64 n1, u64 n2, u64 n3,
+ u64 n4, const char *func, int line)
{
pr_debug("%s:%d: lpar: %u\n", func, line, lpar_id);
_dump_field("n1: ", n1, func, line);
{
pr_debug("%s:%d: lpar: %u\n", func, line, lpar_id);
_dump_field("n1: ", n1, func, line);
#define dump_node(_a, _b, _c, _d, _e, _f, _g) \
_dump_node(_a, _b, _c, _d, _e, _f, _g, __func__, __LINE__)
static void _dump_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4,
#define dump_node(_a, _b, _c, _d, _e, _f, _g) \
_dump_node(_a, _b, _c, _d, _e, _f, _g, __func__, __LINE__)
static void _dump_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4,
- u64 v1, u64 v2, const char* func, int line)
+ u64 v1, u64 v2, const char *func, int line)
{
pr_debug("%s:%d: lpar: %u\n", func, line, lpar_id);
_dump_field("n1: ", n1, func, line);
{
pr_debug("%s:%d: lpar: %u\n", func, line, lpar_id);
_dump_field("n1: ", n1, func, line);
make_first_field("bus", bus_index),
make_field(bus_str, 0),
0, 0,
make_first_field("bus", bus_index),
make_field(bus_str, 0),
0, 0,
}
int ps3_repository_read_bus_id(unsigned int bus_index, u64 *bus_id)
}
int ps3_repository_read_bus_id(unsigned int bus_index, u64 *bus_id)
make_first_field("bus", bus_index),
make_field("type", 0),
0, 0,
make_first_field("bus", bus_index),
make_field("type", 0),
0, 0,
*bus_type = v1;
return result;
}
*bus_type = v1;
return result;
}
make_first_field("bus", bus_index),
make_field("num_dev", 0),
0, 0,
make_first_field("bus", bus_index),
make_field("num_dev", 0),
0, 0,
*num_dev = v1;
return result;
}
*num_dev = v1;
return result;
}
make_field("dev", dev_index),
make_field(dev_str, 0),
0,
make_field("dev", dev_index),
make_field(dev_str, 0),
0,
}
int ps3_repository_read_dev_id(unsigned int bus_index, unsigned int dev_index,
}
int ps3_repository_read_dev_id(unsigned int bus_index, unsigned int dev_index,
make_field("dev", dev_index),
make_field("id", 0),
0,
make_field("dev", dev_index),
make_field("id", 0),
0,
make_field("dev", dev_index),
make_field("type", 0),
0,
make_field("dev", dev_index),
make_field("type", 0),
0,
*dev_type = v1;
return result;
}
int ps3_repository_read_dev_intr(unsigned int bus_index,
unsigned int dev_index, unsigned int intr_index,
*dev_type = v1;
return result;
}
int ps3_repository_read_dev_intr(unsigned int bus_index,
unsigned int dev_index, unsigned int intr_index,
- enum ps3_interrupt_type *intr_type, unsigned int* interrupt_id)
+ enum ps3_interrupt_type *intr_type, unsigned int *interrupt_id)
make_field("dev", dev_index),
make_field("reg", reg_index),
make_field("type", 0),
make_field("dev", dev_index),
make_field("reg", reg_index),
make_field("type", 0),
*reg_type = v1;
return result;
}
*reg_type = v1;
return result;
}
make_first_field("bus", bus_index),
make_field("dev", dev_index),
make_field("port", 0),
make_first_field("bus", bus_index),
make_field("dev", dev_index),
make_field("port", 0),
}
int ps3_repository_read_stor_dev_blk_size(unsigned int bus_index,
}
int ps3_repository_read_stor_dev_blk_size(unsigned int bus_index,
make_first_field("bus", bus_index),
make_field("dev", dev_index),
make_field("blk_size", 0),
make_first_field("bus", bus_index),
make_field("dev", dev_index),
make_field("blk_size", 0),
}
int ps3_repository_read_stor_dev_num_blocks(unsigned int bus_index,
}
int ps3_repository_read_stor_dev_num_blocks(unsigned int bus_index,
make_first_field("bus", bus_index),
make_field("dev", dev_index),
make_field("n_blocks", 0),
make_first_field("bus", bus_index),
make_field("dev", dev_index),
make_field("n_blocks", 0),
}
int ps3_repository_read_stor_dev_num_regions(unsigned int bus_index,
}
int ps3_repository_read_stor_dev_num_regions(unsigned int bus_index,
make_first_field("bus", bus_index),
make_field("dev", dev_index),
make_field("n_regs", 0),
make_first_field("bus", bus_index),
make_field("dev", dev_index),
make_field("n_regs", 0),
*num_regions = v1;
return result;
}
*num_regions = v1;
return result;
}
make_field("dev", dev_index),
make_field("region", region_index),
make_field("id", 0),
make_field("dev", dev_index),
make_field("region", region_index),
make_field("id", 0),
*region_id = v1;
return result;
}
*region_id = v1;
return result;
}
make_field("dev", dev_index),
make_field("region", region_index),
make_field("size", 0),
make_field("dev", dev_index),
make_field("region", region_index),
make_field("size", 0),
}
int ps3_repository_read_stor_dev_region_start(unsigned int bus_index,
}
int ps3_repository_read_stor_dev_region_start(unsigned int bus_index,
make_field("dev", dev_index),
make_field("region", region_index),
make_field("start", 0),
make_field("dev", dev_index),
make_field("region", region_index),
make_field("start", 0),
}
int ps3_repository_read_stor_dev_info(unsigned int bus_index,
}
int ps3_repository_read_stor_dev_info(unsigned int bus_index,
make_field("pu", 0),
ppe_id,
make_field("rm_size", 0),
make_field("pu", 0),
ppe_id,
make_field("rm_size", 0),
}
int ps3_repository_read_region_total(u64 *region_total)
}
int ps3_repository_read_region_total(u64 *region_total)
make_first_field("bi", 0),
make_field("rgntotal", 0),
0, 0,
make_first_field("bi", 0),
make_field("rgntotal", 0),
0, 0,
make_first_field("bi", 0),
make_field("spun", 0),
0, 0,
make_first_field("bi", 0),
make_field("spun", 0),
0, 0,
*num_spu_reserved = v1;
return result;
}
*num_spu_reserved = v1;
return result;
}
make_first_field("bi", 0),
make_field("spursvn", 0),
0, 0,
make_first_field("bi", 0),
make_field("spursvn", 0),
0, 0,
*num_resource_id = v1;
return result;
}
*num_resource_id = v1;
return result;
}
*/
int ps3_repository_read_spu_resource_id(unsigned int res_index,
*/
int ps3_repository_read_spu_resource_id(unsigned int res_index,
- enum ps3_spu_resource_type* resource_type, unsigned int *resource_id)
+ enum ps3_spu_resource_type *resource_type, unsigned int *resource_id)
-int ps3_repository_read_boot_dat_address(u64 *address)
+static int ps3_repository_read_boot_dat_address(u64 *address)
{
return read_node(PS3_LPAR_ID_CURRENT,
make_first_field("bi", 0),
make_field("boot_dat", 0),
make_field("address", 0),
0,
{
return read_node(PS3_LPAR_ID_CURRENT,
make_first_field("bi", 0),
make_field("boot_dat", 0),
make_field("address", 0),
0,
}
int ps3_repository_read_boot_dat_size(unsigned int *size)
}
int ps3_repository_read_boot_dat_size(unsigned int *size)
make_field("boot_dat", 0),
make_field("size", 0),
0,
make_field("boot_dat", 0),
make_field("size", 0),
0,
*size = v1;
return result;
}
*size = v1;
return result;
}
make_field("vir_uart", 0),
make_field("port", 0),
make_field("avset", 0),
make_field("vir_uart", 0),
make_field("port", 0),
make_field("avset", 0),
*port = v1;
return result;
}
*port = v1;
return result;
}
make_field("vir_uart", 0),
make_field("port", 0),
make_field("sysmgr", 0),
make_field("vir_uart", 0),
make_field("port", 0),
make_field("sysmgr", 0),
*port = v1;
return result;
}
*port = v1;
return result;
}
*num_be = v1;
return result;
}
*num_be = v1;
return result;
}
}
int ps3_repository_read_tb_freq(u64 node_id, u64 *tb_freq)
}
int ps3_repository_read_tb_freq(u64 node_id, u64 *tb_freq)
node_id,
make_field("clock", 0),
0,
node_id,
make_field("clock", 0),
0,
}
int ps3_repository_read_be_tb_freq(unsigned int be_index, u64 *tb_freq)
}
int ps3_repository_read_be_tb_freq(unsigned int be_index, u64 *tb_freq)