diff options
| author | Marek Vasut <marex@denx.de> | 2012-11-12 14:34:25 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-12-11 13:17:29 -0700 |
| commit | 2515d8437bf3a4415d3354d01e37f07d922250e2 (patch) | |
| tree | b31bb68afef6e099e172607f4a5c8501b6ff499e /common/cmd_i2c.c | |
| parent | eabd5d8d70ecf7072ac5b7aef2fe239553346dac (diff) | |
| download | blackbird-obmc-uboot-2515d8437bf3a4415d3354d01e37f07d922250e2.tar.gz blackbird-obmc-uboot-2515d8437bf3a4415d3354d01e37f07d922250e2.zip | |
i2c: Use __weak instead of __attribute__((weak, alias))
Use __weak from linux/compiler.h instead of __attribute__((weak, alias))
to define overridable function. This patch is intended as a cleanup patch
to bring some consistency into the code.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'common/cmd_i2c.c')
| -rw-r--r-- | common/cmd_i2c.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c index 4438db594c..c8990ef522 100644 --- a/common/cmd_i2c.c +++ b/common/cmd_i2c.c @@ -82,6 +82,7 @@ #include <i2c.h> #include <malloc.h> #include <asm/byteorder.h> +#include <linux/compiler.h> /* Display values from last command. * Memory modify remembered values are different from display memory. @@ -133,30 +134,27 @@ DECLARE_GLOBAL_DATA_PTR; #define DISP_LINE_LEN 16 /* implement possible board specific board init */ -static void __def_i2c_init_board(void) +__weak +void i2c_init_board(void) { return; } -void i2c_init_board(void) - __attribute__((weak, alias("__def_i2c_init_board"))); /* TODO: Implement architecture-specific get/set functions */ -static unsigned int __def_i2c_get_bus_speed(void) +__weak +unsigned int i2c_get_bus_speed(void) { return CONFIG_SYS_I2C_SPEED; } -unsigned int i2c_get_bus_speed(void) - __attribute__((weak, alias("__def_i2c_get_bus_speed"))); -static int __def_i2c_set_bus_speed(unsigned int speed) +__weak +int i2c_set_bus_speed(unsigned int speed) { if (speed != CONFIG_SYS_I2C_SPEED) return -1; return 0; } -int i2c_set_bus_speed(unsigned int) - __attribute__((weak, alias("__def_i2c_set_bus_speed"))); /* * get_alen: small parser helper function to get address length |
