__attribute__ follows gcc's documented syntax and is generally more common than __attribute. This change is only asthetic and should not affect functionality.

Signed-off-by: Peter Tyser ptyser@xes-inc.com --- cpu/arm920t/at91rm9200/ether.c | 5 +++-- cpu/arm920t/s3c24x0/usb_ohci.h | 8 ++++---- cpu/mips/au1x00_usb_ohci.h | 8 ++++---- cpu/mpc5xxx/usb_ohci.h | 8 ++++---- cpu/mpc86xx/cpu.c | 2 +- cpu/ppc4xx/usb_ohci.h | 8 ++++---- drivers/mmc/mmc.c | 4 ++-- drivers/usb/host/ohci.h | 8 ++++---- drivers/usb/musb/musb_core.h | 2 +- include/asm-m68k/types.h | 2 +- include/asm-ppc/types.h | 2 +- include/asm-sparc/types.h | 2 +- net/eth.c | 4 ++-- 13 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/cpu/arm920t/at91rm9200/ether.c b/cpu/arm920t/at91rm9200/ether.c index b00b948..d9d33a2 100644 --- a/cpu/arm920t/at91rm9200/ether.c +++ b/cpu/arm920t/at91rm9200/ether.c @@ -53,10 +53,11 @@ typedef struct { #if defined(CONFIG_CMD_NET)

/* alignment as per Errata #11 (64 bytes) is insufficient! */ -rbf_t rbfdt[RBF_FRAMEMAX] __attribute((aligned(512))); +rbf_t rbfdt[RBF_FRAMEMAX] __attribute__((aligned(512))); rbf_t *rbfp;

-unsigned char rbf_framebuf[RBF_FRAMEMAX][RBF_FRAMELEN] __attribute((aligned(4))); +unsigned char rbf_framebuf[RBF_FRAMEMAX][RBF_FRAMELEN] + __attribute__((aligned(4)));

/* structure to interface the PHY */ AT91S_PhyOps PhyOps; diff --git a/cpu/arm920t/s3c24x0/usb_ohci.h b/cpu/arm920t/s3c24x0/usb_ohci.h index 3af5fca..8e093fb 100644 --- a/cpu/arm920t/s3c24x0/usb_ohci.h +++ b/cpu/arm920t/s3c24x0/usb_ohci.h @@ -55,7 +55,7 @@ struct ed {

struct usb_device *usb_dev; __u32 unused[3]; -} __attribute((aligned(16))); +} __attribute__((aligned(16))); typedef struct ed ed_t;

@@ -112,7 +112,7 @@ struct td { __u32 data;

__u32 unused2[2]; -} __attribute((aligned(32))); +} __attribute__((aligned(32))); typedef struct td td_t;

#define OHCI_ED_SKIP (1 << 14) @@ -130,7 +130,7 @@ struct ohci_hcca { __u16 pad1; /* set to 0 on each frame_no change */ __u32 done_head; /* info returned for an interrupt */ u8 reserved_for_hc[116]; -} __attribute((aligned(256))); +} __attribute__((aligned(256)));

/* @@ -172,7 +172,7 @@ struct ohci_regs { __u32 status; __u32 portstatus[MAX_ROOT_PORTS]; } roothub; -} __attribute((aligned(32))); +} __attribute__((aligned(32)));

/* OHCI CONTROL AND STATUS REGISTER MASKS */ diff --git a/cpu/mips/au1x00_usb_ohci.h b/cpu/mips/au1x00_usb_ohci.h index 631ef0a..bb9f351 100644 --- a/cpu/mips/au1x00_usb_ohci.h +++ b/cpu/mips/au1x00_usb_ohci.h @@ -56,7 +56,7 @@ struct ed {

struct usb_device *usb_dev; __u32 unused[3]; -} __attribute((aligned(16))); +} __attribute__((aligned(16))); typedef struct ed ed_t;

@@ -114,7 +114,7 @@ struct td { __u32 data;

__u32 unused2[2]; -} __attribute((aligned(32))); +} __attribute__((aligned(32))); typedef struct td td_t;

#define OHCI_ED_SKIP (1 << 14) @@ -132,7 +132,7 @@ struct ohci_hcca { __u16 pad1; /* set to 0 on each frame_no change */ __u32 done_head; /* info returned for an interrupt */ u8 reserved_for_hc[116]; -} __attribute((aligned(256))); +} __attribute__((aligned(256)));

/* @@ -174,7 +174,7 @@ struct ohci_regs { __u32 status; __u32 portstatus[MAX_ROOT_PORTS]; } roothub; -} __attribute((aligned(32))); +} __attribute__((aligned(32)));

/* OHCI CONTROL AND STATUS REGISTER MASKS */ diff --git a/cpu/mpc5xxx/usb_ohci.h b/cpu/mpc5xxx/usb_ohci.h index 884f1d5..6eedbdd 100644 --- a/cpu/mpc5xxx/usb_ohci.h +++ b/cpu/mpc5xxx/usb_ohci.h @@ -56,7 +56,7 @@ struct ed {

struct usb_device *usb_dev; __u32 unused[3]; -} __attribute((aligned(16))); +} __attribute__((aligned(16))); typedef struct ed ed_t;

@@ -113,7 +113,7 @@ struct td { __u32 data;

__u32 unused2[2]; -} __attribute((aligned(32))); +} __attribute__((aligned(32))); typedef struct td td_t;

#define OHCI_ED_SKIP (1 << 14) @@ -136,7 +136,7 @@ struct ohci_hcca { #endif __u32 done_head; /* info returned for an interrupt */ u8 reserved_for_hc[116]; -} __attribute((aligned(256))); +} __attribute__((aligned(256)));

/* @@ -178,7 +178,7 @@ struct ohci_regs { __u32 status; __u32 portstatus[MAX_ROOT_PORTS]; } roothub; -} __attribute((aligned(32))); +} __attribute__((aligned(32)));

/* OHCI CONTROL AND STATUS REGISTER MASKS */ diff --git a/cpu/mpc86xx/cpu.c b/cpu/mpc86xx/cpu.c index c41616d..653a137 100644 --- a/cpu/mpc86xx/cpu.c +++ b/cpu/mpc86xx/cpu.c @@ -40,7 +40,7 @@ __board_reset(void) { /* Do nothing */ } -void board_reset(void) __attribute((weak, alias("__board_reset"))); +void board_reset(void) __attribute__((weak, alias("__board_reset")));

int diff --git a/cpu/ppc4xx/usb_ohci.h b/cpu/ppc4xx/usb_ohci.h index 706e05e..2c3dc4f 100644 --- a/cpu/ppc4xx/usb_ohci.h +++ b/cpu/ppc4xx/usb_ohci.h @@ -55,7 +55,7 @@ struct ed {

struct usb_device *usb_dev; __u32 unused[3]; -} __attribute((aligned(16))); +} __attribute__((aligned(16))); typedef struct ed ed_t;

/* TD info field */ @@ -111,7 +111,7 @@ struct td { __u32 data;

__u32 unused2[2]; -} __attribute((aligned(32))); +} __attribute__((aligned(32))); typedef struct td td_t;

#define OHCI_ED_SKIP (1 << 14) @@ -134,7 +134,7 @@ struct ohci_hcca { #endif __u32 done_head; /* info returned for an interrupt */ u8 reserved_for_hc[116]; -} __attribute((aligned(256))); +} __attribute__((aligned(256)));

/* * Maximum number of root hub ports. @@ -175,7 +175,7 @@ struct ohci_regs { __u32 status; __u32 portstatus[MAX_ROOT_PORTS]; } roothub; -} __attribute((aligned(32))); +} __attribute__((aligned(32)));

/* OHCI CONTROL AND STATUS REGISTER MASKS */

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 96186d9..7791c38 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -896,8 +896,8 @@ static int __def_mmc_init(bd_t *bis) return -1; }

-int cpu_mmc_init(bd_t *bis) __attribute((weak, alias("__def_mmc_init"))); -int board_mmc_init(bd_t *bis) __attribute((weak, alias("__def_mmc_init"))); +int cpu_mmc_init(bd_t *bis) __attribute__((weak, alias("__def_mmc_init"))); +int board_mmc_init(bd_t *bis) __attribute__((weak, alias("__def_mmc_init")));

void print_mmc_devices(char separator) { diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h index a547337..79aa79d 100644 --- a/drivers/usb/host/ohci.h +++ b/drivers/usb/host/ohci.h @@ -101,7 +101,7 @@ struct ed { struct usb_device *usb_dev; void *purb; __u32 unused[2]; -} __attribute((aligned(16))); +} __attribute__((aligned(16))); typedef struct ed ed_t;

@@ -161,7 +161,7 @@ struct td { __u32 data;

__u32 unused2[2]; -} __attribute((aligned(32))); +} __attribute__((aligned(32))); typedef struct td td_t;

#define OHCI_ED_SKIP (1 << 14) @@ -184,7 +184,7 @@ struct ohci_hcca { #endif __u32 done_head; /* info returned for an interrupt */ u8 reserved_for_hc[116]; -} __attribute((aligned(256))); +} __attribute__((aligned(256)));

/* @@ -228,7 +228,7 @@ struct ohci_regs { __u32 status; __u32 portstatus[CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS]; } roothub; -} __attribute((aligned(32))); +} __attribute__((aligned(32)));

/* Some EHCI controls */ #define EHCI_USBCMD_OFF 0x20 diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h index 2597c5f..b81c536 100644 --- a/drivers/usb/musb/musb_core.h +++ b/drivers/usb/musb/musb_core.h @@ -97,7 +97,7 @@ struct musb_regs { u8 rxhubaddr; u8 rxhubport; } tar[16]; -} __attribute((aligned(32))); +} __attribute__((aligned(32)));

/* * MUSB Register bits diff --git a/include/asm-m68k/types.h b/include/asm-m68k/types.h index 44b4ca5..3ffcab2 100644 --- a/include/asm-m68k/types.h +++ b/include/asm-m68k/types.h @@ -21,7 +21,7 @@ __extension__ typedef unsigned long long __u64;

typedef struct { __u32 u[4]; -} __attribute((aligned(16))) vector128; +} __attribute__((aligned(16))) vector128;

#ifdef __KERNEL__ /* diff --git a/include/asm-ppc/types.h b/include/asm-ppc/types.h index 864391f..b27a6b7 100644 --- a/include/asm-ppc/types.h +++ b/include/asm-ppc/types.h @@ -21,7 +21,7 @@ __extension__ typedef unsigned long long __u64;

typedef struct { __u32 u[4]; -} __attribute((aligned(16))) vector128; +} __attribute__((aligned(16))) vector128;

#ifdef __KERNEL__ /* diff --git a/include/asm-sparc/types.h b/include/asm-sparc/types.h index 2cf974a..0a8a26c 100644 --- a/include/asm-sparc/types.h +++ b/include/asm-sparc/types.h @@ -42,7 +42,7 @@ typedef unsigned long long __u64;

typedef struct { __u32 u[4]; -} __attribute((aligned(16))) vector128; +} __attribute__((aligned(16))) vector128;

#ifdef __KERNEL__ /* diff --git a/net/eth.c b/net/eth.c index 4bbf84b..c6fa5b9 100644 --- a/net/eth.c +++ b/net/eth.c @@ -68,8 +68,8 @@ static int __def_eth_init(bd_t *bis) { return -1; } -int cpu_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init"))); -int board_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init"))); +int cpu_eth_init(bd_t *bis) __attribute__((weak, alias("__def_eth_init"))); +int board_eth_init(bd_t *bis) __attribute__((weak, alias("__def_eth_init")));

extern int mv6436x_eth_initialize(bd_t *); extern int mv6446x_eth_initialize(bd_t *);