diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-05-16 11:10:30 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-06-03 20:27:23 +0200 |
| commit | 289011207d999b2e4085150d2aa30d547ad9b800 (patch) | |
| tree | 0bd9e04764c76756b73176ff277f6c050333ba44 /include | |
| parent | 110e006fe67fb4a6e1719ae6956c79b7ffc0148b (diff) | |
| download | u-boot-imx-289011207d999b2e4085150d2aa30d547ad9b800.zip u-boot-imx-289011207d999b2e4085150d2aa30d547ad9b800.tar.gz u-boot-imx-289011207d999b2e4085150d2aa30d547ad9b800.tar.bz2 | |
Move definition of container_of() to common.h
AVR32 and AT91SAM9 both have their own identical definitions of
container_of() taken from the Linux kernel. Move it to common.h so
that all architectures can use it.
container_of() is already used by some drivers, and will be used
extensively by the new and improved SPI API.
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-at91sam9/hardware.h | 11 | ||||
| -rw-r--r-- | include/asm-avr32/u-boot.h | 11 | ||||
| -rw-r--r-- | include/common.h | 11 |
3 files changed, 11 insertions, 22 deletions
diff --git a/include/asm-arm/arch-at91sam9/hardware.h b/include/asm-arm/arch-at91sam9/hardware.h index e7c572d..f312419 100644 --- a/include/asm-arm/arch-at91sam9/hardware.h +++ b/include/asm-arm/arch-at91sam9/hardware.h @@ -51,15 +51,4 @@ #error "Unsupported AT91 processor" #endif -/* - * container_of - cast a member of a structure out to the containing structure - * - * @ptr: the pointer to the member. - * @type: the type of the container struct this is embedded in. - * @member: the name of the member within the struct. - */ -#define container_of(ptr, type, member) ({ \ - const typeof(((type *)0)->member) *__mptr = (ptr); \ - (type *)((char *)__mptr - offsetof(type, member)); }) - #endif diff --git a/include/asm-avr32/u-boot.h b/include/asm-avr32/u-boot.h index 71dfcaf..85ef008 100644 --- a/include/asm-avr32/u-boot.h +++ b/include/asm-avr32/u-boot.h @@ -42,15 +42,4 @@ typedef struct bd_info { #define bi_memstart bi_dram[0].start #define bi_memsize bi_dram[0].size -/** - * container_of - cast a member of a structure out to the containing structure - * - * @ptr: the pointer to the member. - * @type: the type of the container struct this is embedded in. - * @member: the name of the member within the struct. - */ -#define container_of(ptr, type, member) ({ \ - const typeof( ((type *)0)->member ) *__mptr = (ptr); \ - (type *)( (char *)__mptr - offsetof(type,member) );}) - #endif /* __ASM_U_BOOT_H__ */ diff --git a/include/common.h b/include/common.h index d0f5704..26e1b46 100644 --- a/include/common.h +++ b/include/common.h @@ -176,6 +176,17 @@ typedef void (interrupt_handler_t)(void *); (__x > __y) ? __x : __y; }) +/** + * container_of - cast a member of a structure out to the containing structure + * @ptr: the pointer to the member. + * @type: the type of the container struct this is embedded in. + * @member: the name of the member within the struct. + * + */ +#define container_of(ptr, type, member) ({ \ + const typeof( ((type *)0)->member ) *__mptr = (ptr); \ + (type *)( (char *)__mptr - offsetof(type,member) );}) + /* * Function Prototypes */ |