minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-11 21:18:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

i2c: Use __weak instead of __attribute__((weak, alias))

Browse Source 
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>
This commit is contained in:
Marek Vasut 2012-11-12 14:34:25 +00:00 committed by Tom Rini
parent eabd5d8d70
commit 2515d8437b
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/cmd_i2c.c
View File

@ -82,6 +82,7 @@
#include <i2c.h> #include <i2c.h>
#include <malloc.h> #include <malloc.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <linux/compiler.h>
/* Display values from last command. /* Display values from last command.
* Memory modify remembered values are different from display memory. * Memory modify remembered values are different from display memory.
@ -133,30 +134,27 @@ DECLARE_GLOBAL_DATA_PTR;
#define DISP_LINE_LEN 16 #define DISP_LINE_LEN 16
/* implement possible board specific board init */ /* implement possible board specific board init */
static void __def_i2c_init_board(void) __weak
void i2c_init_board(void)
{ {
return; return;
} }
void i2c_init_board(void)
__attribute__((weak, alias("__def_i2c_init_board")));
/* TODO: Implement architecture-specific get/set functions */ /* 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; 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) if (speed != CONFIG_SYS_I2C_SPEED)
return -1; return -1;
return 0; 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 * get_alen: small parser helper function to get address length