diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 15:37:28 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 15:37:28 +0200 |
| commit | 3da254164501726d092c6e26103a7e1bf3971260 (patch) | |
| tree | eec0e0ae14a3f1d7176de6206f4375027a2a9392 /arch/arm/mach-at91/include/mach | |
| parent | 4909e13cd9d864f95f63d2d16489778fff483460 (diff) | |
| parent | 3aa630b3e6be83c4e91a68537fe6edf80f8d295e (diff) | |
Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup
From Nicolas Ferre <nicolas.ferre@atmel.com>:
Trivial typos and some macros removal & modification
* tag 'at91-cleanup' of git://github.com/at91linux/linux-at91:
ARM: at91: remove trailing semicolon from macros
ARM: at91/setup: fix trivial typos
ARM: at91: remove unused dbgu_readl() macro
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-at91/include/mach')
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91_dbgu.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91_matrix.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91_st.h | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-at91/include/mach/at91_dbgu.h b/arch/arm/mach-at91/include/mach/at91_dbgu.h index 2aa0c5e13495..3b5948566e52 100644 --- a/arch/arm/mach-at91/include/mach/at91_dbgu.h +++ b/arch/arm/mach-at91/include/mach/at91_dbgu.h @@ -16,9 +16,6 @@ #ifndef AT91_DBGU_H #define AT91_DBGU_H -#define dbgu_readl(dbgu, field) \ - __raw_readl(AT91_VA_BASE_SYS + dbgu + AT91_DBGU_ ## field) - #if !defined(CONFIG_ARCH_AT91X40) #define AT91_DBGU_CR (0x00) /* Control Register */ #define AT91_DBGU_MR (0x04) /* Mode Register */ diff --git a/arch/arm/mach-at91/include/mach/at91_matrix.h b/arch/arm/mach-at91/include/mach/at91_matrix.h index 02fae9de746b..f8996c954131 100644 --- a/arch/arm/mach-at91/include/mach/at91_matrix.h +++ b/arch/arm/mach-at91/include/mach/at91_matrix.h @@ -14,7 +14,7 @@ extern void __iomem *at91_matrix_base; __raw_readl(at91_matrix_base + field) #define at91_matrix_write(field, value) \ - __raw_writel(value, at91_matrix_base + field); + __raw_writel(value, at91_matrix_base + field) #else .extern at91_matrix_base diff --git a/arch/arm/mach-at91/include/mach/at91_st.h b/arch/arm/mach-at91/include/mach/at91_st.h index 969aac27109f..67fdbd13c3ed 100644 --- a/arch/arm/mach-at91/include/mach/at91_st.h +++ b/arch/arm/mach-at91/include/mach/at91_st.h @@ -23,7 +23,7 @@ extern void __iomem *at91_st_base; __raw_readl(at91_st_base + field) #define at91_st_write(field, value) \ - __raw_writel(value, at91_st_base + field); + __raw_writel(value, at91_st_base + field) #else .extern at91_st_base #endif |