From 82874afa53d5df53f2729259f7a8815905637e11 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Sat, 23 Aug 2008 15:47:58 -0700 Subject: [PATCH] Misc fixes to sync with mainline Based on comments from Russell King. Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/serial.c | 6 +++--- arch/arm/plat-omap/include/mach/control.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index d9fca6f343ff..bd6f8c965fbe 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -28,7 +28,7 @@ static struct clk *uart_fck[OMAP_MAX_NR_PORTS]; static struct plat_serial8250_port serial_platform_data[] = { { - .membase = (__force void __iomem *)IO_ADDRESS(OMAP_UART1_BASE), + .membase = (void __iomem *)IO_ADDRESS(OMAP_UART1_BASE), .mapbase = (unsigned long)OMAP_UART1_BASE, .irq = 72, .flags = UPF_BOOT_AUTOCONF, @@ -36,7 +36,7 @@ static struct plat_serial8250_port serial_platform_data[] = { .regshift = 2, .uartclk = OMAP24XX_BASE_BAUD * 16, }, { - .membase = (__force void __iomem *)IO_ADDRESS(OMAP_UART2_BASE), + .membase = (void __iomem *)IO_ADDRESS(OMAP_UART2_BASE), .mapbase = (unsigned long)OMAP_UART2_BASE, .irq = 73, .flags = UPF_BOOT_AUTOCONF, @@ -44,7 +44,7 @@ static struct plat_serial8250_port serial_platform_data[] = { .regshift = 2, .uartclk = OMAP24XX_BASE_BAUD * 16, }, { - .membase = (__force void __iomem *)IO_ADDRESS(OMAP_UART3_BASE), + .membase = (void __iomem *)IO_ADDRESS(OMAP_UART3_BASE), .mapbase = (unsigned long)OMAP_UART3_BASE, .irq = 74, .flags = UPF_BOOT_AUTOCONF, diff --git a/arch/arm/plat-omap/include/mach/control.h b/arch/arm/plat-omap/include/mach/control.h index e15d6e988185..1cd98fd9801a 100644 --- a/arch/arm/plat-omap/include/mach/control.h +++ b/arch/arm/plat-omap/include/mach/control.h @@ -20,11 +20,11 @@ #ifndef __ASSEMBLY__ #define OMAP242X_CTRL_REGADDR(reg) \ - (__force void __iomem *)IO_ADDRESS(OMAP242X_CTRL_BASE + (reg)) + (void __iomem *)IO_ADDRESS(OMAP242X_CTRL_BASE + (reg)) #define OMAP243X_CTRL_REGADDR(reg) \ - (__force void __iomem *)IO_ADDRESS(OMAP243X_CTRL_BASE + (reg)) + (void __iomem *)IO_ADDRESS(OMAP243X_CTRL_BASE + (reg)) #define OMAP343X_CTRL_REGADDR(reg) \ - (__force void __iomem *)IO_ADDRESS(OMAP343X_CTRL_BASE + (reg)) + (void __iomem *)IO_ADDRESS(OMAP343X_CTRL_BASE + (reg)) #else #define OMAP242X_CTRL_REGADDR(reg) IO_ADDRESS(OMAP242X_CTRL_BASE + (reg)) #define OMAP243X_CTRL_REGADDR(reg) IO_ADDRESS(OMAP243X_CTRL_BASE + (reg)) -- 2.39.2