Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3da25416 authored Apr 09, 2013 by Arnd Bergmann

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>

parents 4909e13c 3aa630b3

arch/arm/mach-at91/at91_rstc.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -23,7 +23,7 @@ extern void __iomem *at91_rstc_base;
	__raw_readl(at91_rstc_base + field)		__raw_readl(at91_rstc_base + field)

	#define at91_rstc_write(field, value) \		#define at91_rstc_write(field, value) \
	__raw_writel(value, at91_rstc_base + field);		__raw_writel(value, at91_rstc_base + field)
	#else		#else
	.extern at91_rstc_base		.extern at91_rstc_base
	#endif		#endif

arch/arm/mach-at91/at91_shdwc.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -23,7 +23,7 @@ extern void __iomem *at91_shdwc_base;
	__raw_readl(at91_shdwc_base + field)		__raw_readl(at91_shdwc_base + field)

	#define at91_shdwc_write(field, value) \		#define at91_shdwc_write(field, value) \
	__raw_writel(value, at91_shdwc_base + field);		__raw_writel(value, at91_shdwc_base + field)
	#endif		#endif

	#define AT91_SHDW_CR 0x00 /* Shut Down Control Register */		#define AT91_SHDW_CR 0x00 /* Shut Down Control Register */

arch/arm/mach-at91/at91x40_time.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -33,7 +33,7 @@
	__raw_readl(AT91_IO_P2V(AT91_TC) + field)		__raw_readl(AT91_IO_P2V(AT91_TC) + field)

	#define at91_tc_write(field, value) \		#define at91_tc_write(field, value) \
	__raw_writel(value, AT91_IO_P2V(AT91_TC) + field);		__raw_writel(value, AT91_IO_P2V(AT91_TC) + field)

	/*		/*
	* 3 counter/timer units present.		* 3 counter/timer units present.

arch/arm/mach-at91/include/mach/at91_dbgu.h

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -16,9 +16,6 @@
	#ifndef AT91_DBGU_H		#ifndef AT91_DBGU_H
	#define 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)		#if !defined(CONFIG_ARCH_AT91X40)
	#define AT91_DBGU_CR (0x00) /* Control Register */		#define AT91_DBGU_CR (0x00) /* Control Register */
	#define AT91_DBGU_MR (0x04) /* Mode Register */		#define AT91_DBGU_MR (0x04) /* Mode Register */

arch/arm/mach-at91/include/mach/at91_matrix.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@ extern void __iomem *at91_matrix_base;
	__raw_readl(at91_matrix_base + field)		__raw_readl(at91_matrix_base + field)

	#define at91_matrix_write(field, value) \		#define at91_matrix_write(field, value) \
	__raw_writel(value, at91_matrix_base + field);		__raw_writel(value, at91_matrix_base + field)

	#else		#else
	.extern at91_matrix_base		.extern at91_matrix_base