summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2013-10-16 13:53:02 +0900
committerHeiko Schocher <hs@denx.de>2013-10-17 07:24:41 +0200
commit9a2a73d29fa395f42f3fb477ac99dda4d7f2f21f (patch)
treeba9fdd0a5835acd6029c94493c03e4282bcb5a15 /drivers
parent10cee5166539ccfce7f7d5776fb75558af385405 (diff)
downloadu-boot-imx-9a2a73d29fa395f42f3fb477ac99dda4d7f2f21f.zip
u-boot-imx-9a2a73d29fa395f42f3fb477ac99dda4d7f2f21f.tar.gz
u-boot-imx-9a2a73d29fa395f42f3fb477ac99dda4d7f2f21f.tar.bz2
i2c: eliminate warnings in i2c_reloc_fixup function
The prototype of handlers had changed. This commit uses cast with (void *) rather than the handler-specific prototype. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i2c/i2c_core.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/i2c/i2c_core.c b/drivers/i2c/i2c_core.c
index b067b7c..e1767f4 100644
--- a/drivers/i2c/i2c_core.c
+++ b/drivers/i2c/i2c_core.c
@@ -56,25 +56,23 @@ void i2c_reloc_fixup(void)
/* i2c_init() */
addr = (unsigned long)i2c_adap_p->init;
addr += gd->reloc_off;
- i2c_adap_p->init = (void (*)(int, int))addr;
+ i2c_adap_p->init = (void *)addr;
/* i2c_probe() */
addr = (unsigned long)i2c_adap_p->probe;
addr += gd->reloc_off;
- i2c_adap_p->probe = (int (*)(uint8_t))addr;
+ i2c_adap_p->probe = (void *)addr;
/* i2c_read() */
addr = (unsigned long)i2c_adap_p->read;
addr += gd->reloc_off;
- i2c_adap_p->read = (int (*)(uint8_t, uint, int, uint8_t *,
- int))addr;
+ i2c_adap_p->read = (void *)addr;
/* i2c_write() */
addr = (unsigned long)i2c_adap_p->write;
addr += gd->reloc_off;
- i2c_adap_p->write = (int (*)(uint8_t, uint, int, uint8_t *,
- int))addr;
+ i2c_adap_p->write = (void *)addr;
/* i2c_set_bus_speed() */
addr = (unsigned long)i2c_adap_p->set_bus_speed;
addr += gd->reloc_off;
- i2c_adap_p->set_bus_speed = (uint (*)(uint))addr;
+ i2c_adap_p->set_bus_speed = (void *)addr;
/* name */
addr = (unsigned long)i2c_adap_p->name;
addr += gd->reloc_off;