diff mbox

Re: [PATCH] rtc: mxc: drop defines already included in rtc.h

Message ID 20110505170233.69b70b9b.akpm@linux-foundation.org
State Accepted
Headers show

Commit Message

Andrew Morton May 6, 2011, 12:02 a.m. UTC 
On Wed,  4 May 2011 17:53:26 +0200
Wolfram Sang <w.sang@pengutronix.de> wrote:

> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> Cc: Vladimir Zapolskiy <vzapolskiy@gmail.com>
> Cc: Alessandro Zummo <alessandro.zummo@towertech.it>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> ---
>  drivers/rtc/rtc-mxc.c |    6 ------
>  1 files changed, 0 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c
> index c996218..4e5c359 100644
> --- a/drivers/rtc/rtc-mxc.c
> +++ b/drivers/rtc/rtc-mxc.c
> @@ -55,12 +55,6 @@ static const u32 PIE_BIT_DEF[MAX_PIE_NUM][2] = {
>  	{ MAX_PIE_FREQ,	RTC_SAM7_BIT },
>  };
>  
> -/* Those are the bits from a classic RTC we want to mimic */
> -#define RTC_IRQF	0x80	/* any of the following 3 is active */
> -#define RTC_PF		0x40	/* Periodic interrupt */
> -#define RTC_AF		0x20	/* Alarm interrupt */
> -#define RTC_UF		0x10	/* Update interrupt for 1Hz RTC */
> -
>  #define MXC_RTC_TIME	0
>  #define MXC_RTC_ALARM	1

But the definitions in rtc.h don't have the nice comments!
diff mbox

Patch

--- a/include/linux/rtc.h~drivers-rtc-rtc-mxcc-remove-defines-already-included-in-rtch-fix
+++ a/include/linux/rtc.h
@@ -92,10 +92,10 @@  struct rtc_pll_info {
 #define RTC_PLL_SET	_IOW('p', 0x12, struct rtc_pll_info)  /* Set PLL correction */
 
 /* interrupt flags */
-#define RTC_IRQF 0x80 /* any of the following is active */
-#define RTC_PF 0x40
-#define RTC_AF 0x20
-#define RTC_UF 0x10
+#define RTC_IRQF 0x80	/* Any of the following is active */
+#define RTC_PF 0x40	/* Periodic interrupt */
+#define RTC_AF 0x20	/* Alarm interrupt */
+#define RTC_UF 0x10	/* Update interrupt for 1Hz RTC */
 
 #ifdef __KERNEL__