redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

fsi: core: Fix sparse warnings 

fsi-core.c:210:9: warning: cast to restricted __be32
fsi-core.c:210:9: warning: cast to restricted __be32
fsi-core.c:210:9: warning: cast to restricted __be32
fsi-core.c:210:9: warning: cast to restricted __be32
fsi-core.c:210:9: warning: cast to restricted __be32
fsi-core.c:210:9: warning: cast to restricted __be32
fsi-core.c:210:9: warning: cast to restricted __be32
fsi-core.c:210:9: warning: cast to restricted __be32
fsi-core.c:210:9: warning: cast to restricted __be32
fsi-core.c:210:9: warning: cast to restricted __be32
fsi-core.c:210:9: warning: cast to restricted __be32
fsi-core.c:210:9: warning: cast to restricted __be32
fsi-core.c:606:15: warning: incorrect type in assignment (different base types)
fsi-core.c:606:15:    expected unsigned int [unsigned] [assigned] [usertype] smode
fsi-core.c:606:15:    got restricted __be32 [usertype] <noident>
fsi-core.c:492:28: warning: expression using sizeof(void)
fsi-core.c:520:29: warning: expression using sizeof(void)
fsi-core.c:682:19: warning: cast to restricted __be32
fsi-core.c:682:19: warning: cast to restricted __be32
fsi-core.c:682:19: warning: cast to restricted __be32
fsi-core.c:682:19: warning: cast to restricted __be32
fsi-core.c:682:19: warning: cast to restricted __be32
fsi-core.c:682:19: warning: cast to restricted __be32
fsi-core.c:706:24: warning: incorrect type in assignment (different base types)
fsi-core.c:706:24:    expected unsigned int [unsigned] [usertype] llmode
fsi-core.c:706:24:    got restricted __be32 [usertype] <noident>

Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
hifive-unleashed-5.1
Joel Stanley 2018-06-18 13:13:35 +09:30 committed by Benjamin Herrenschmidt
parent fbdb5eac5c
commit 11454d6dc8
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/fsi/fsi-core.c
View File

@ -190,7 +190,7 @@ static int fsi_slave_calc_addr(struct fsi_slave *slave, uint32_t *addrp,
static int fsi_slave_report_and_clear_errors(struct fsi_slave *slave) static int fsi_slave_report_and_clear_errors(struct fsi_slave *slave)
{ {
struct fsi_master *master = slave->master; struct fsi_master *master = slave->master;
uint32_t irq, stat; __be32 irq, stat;
int rc, link; int rc, link;
uint8_t id; uint8_t id;
@ -390,7 +390,6 @@ static struct device_node *fsi_device_find_of_node(struct fsi_device *dev)
static int fsi_slave_scan(struct fsi_slave *slave) static int fsi_slave_scan(struct fsi_slave *slave)
{ {
uint32_t engine_addr; uint32_t engine_addr;
uint32_t conf;
int rc, i; int rc, i;
/* /*
@ -404,15 +403,17 @@ static int fsi_slave_scan(struct fsi_slave *slave)
for (i = 2; i < engine_page_size / sizeof(uint32_t); i++) { for (i = 2; i < engine_page_size / sizeof(uint32_t); i++) {
uint8_t slots, version, type, crc; uint8_t slots, version, type, crc;
struct fsi_device *dev; struct fsi_device *dev;
uint32_t conf;
__be32 data;
rc = fsi_slave_read(slave, (i + 1) * sizeof(conf), rc = fsi_slave_read(slave, (i + 1) * sizeof(data),
&conf, sizeof(conf)); &data, sizeof(data));
if (rc) { if (rc) {
dev_warn(&slave->dev, dev_warn(&slave->dev,
"error reading slave registers\n"); "error reading slave registers\n");
return -1; return -1;
} }
conf = be32_to_cpu(conf); conf = be32_to_cpu(data);
crc = crc4(0, conf, 32); crc = crc4(0, conf, 32);
if (crc) { if (crc) {
@ -597,15 +598,16 @@ static uint32_t fsi_slave_smode(int id)
static int fsi_slave_set_smode(struct fsi_master *master, int link, int id) static int fsi_slave_set_smode(struct fsi_master *master, int link, int id)
{ {
uint32_t smode; uint32_t smode;
__be32 data;
/* set our smode register with the slave ID field to 0; this enables /* set our smode register with the slave ID field to 0; this enables
* extended slave addressing * extended slave addressing
*/ */
smode = fsi_slave_smode(id); smode = fsi_slave_smode(id);
smode = cpu_to_be32(smode); data = cpu_to_be32(smode);
return fsi_master_write(master, link, id, FSI_SLAVE_BASE + FSI_SMODE, return fsi_master_write(master, link, id, FSI_SLAVE_BASE + FSI_SMODE,
&smode, sizeof(smode)); &data, sizeof(data));
} }
static void fsi_slave_release(struct device *dev) static void fsi_slave_release(struct device *dev)
@ -661,9 +663,10 @@ static struct device_node *fsi_slave_find_of_node(struct fsi_master *master,
static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id) static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id)
{ {
uint32_t chip_id, llmode; uint32_t chip_id;
struct fsi_slave *slave; struct fsi_slave *slave;
uint8_t crc; uint8_t crc;
__be32 data, llmode;
int rc; int rc;
/* Currently, we only support single slaves on a link, and use the /* Currently, we only support single slaves on a link, and use the
@ -672,13 +675,13 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id)
if (id != 0) if (id != 0)
return -EINVAL; return -EINVAL;
rc = fsi_master_read(master, link, id, 0, &chip_id, sizeof(chip_id)); rc = fsi_master_read(master, link, id, 0, &data, sizeof(data));
if (rc) { if (rc) {
dev_dbg(&master->dev, "can't read slave %02x:%02x %d\n", dev_dbg(&master->dev, "can't read slave %02x:%02x %d\n",
link, id, rc); link, id, rc);
return -ENODEV; return -ENODEV;
} }
chip_id = be32_to_cpu(chip_id); chip_id = be32_to_cpu(data);
crc = crc4(0, chip_id, 32); crc = crc4(0, chip_id, 32);
if (crc) { if (crc) {