From: Alessandro Zummo <a.zummo@towertech.it>
To: linux-kernel@vger.kernel.org
Cc: akpm@zip.com.au, akpm@digeo.com, Richard Purdie <rpurdie@rpsys.net>
Subject: [PATCH 03/16] RTC subsystem, ARM Integrator cleanup
Date: Mon, 06 Mar 2006 02:50:11 +0100 [thread overview]
Message-ID: <20060306015009.487349000@towertech.it> (raw)
In-Reply-To: 20060306015008.858209000@towertech.it
[-- Attachment #1: rtc-arm-integrator-cleanup.patch --]
[-- Type: text/plain, Size: 1927 bytes --]
Fix some namespace conflicts between the RTC subsystem and the ARM
Integrator time functions.
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
---
arch/arm/mach-integrator/time.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
--- linux-rtc.orig/arch/arm/mach-integrator/time.c 2006-03-03 00:15:21.000000000 +0100
+++ linux-rtc/arch/arm/mach-integrator/time.c 2006-03-05 01:22:45.000000000 +0100
@@ -40,13 +40,13 @@ static int integrator_set_rtc(void)
return 1;
}
-static int rtc_read_alarm(struct rtc_wkalrm *alrm)
+static int integrator_rtc_read_alarm(struct rtc_wkalrm *alrm)
{
rtc_time_to_tm(readl(rtc_base + RTC_MR), &alrm->time);
return 0;
}
-static inline int rtc_set_alarm(struct rtc_wkalrm *alrm)
+static inline int integrator_rtc_set_alarm(struct rtc_wkalrm *alrm)
{
unsigned long time;
int ret;
@@ -62,7 +62,7 @@ static inline int rtc_set_alarm(struct r
return ret;
}
-static int rtc_read_time(struct rtc_time *tm)
+static int integrator_rtc_read_time(struct rtc_time *tm)
{
rtc_time_to_tm(readl(rtc_base + RTC_DR), tm);
return 0;
@@ -76,7 +76,7 @@ static int rtc_read_time(struct rtc_time
* edge of the 1Hz clock, we must write the time one second
* in advance.
*/
-static inline int rtc_set_time(struct rtc_time *tm)
+static inline int integrator_rtc_set_time(struct rtc_time *tm)
{
unsigned long time;
int ret;
@@ -90,10 +90,10 @@ static inline int rtc_set_time(struct rt
static struct rtc_ops rtc_ops = {
.owner = THIS_MODULE,
- .read_time = rtc_read_time,
- .set_time = rtc_set_time,
- .read_alarm = rtc_read_alarm,
- .set_alarm = rtc_set_alarm,
+ .read_time = integrator_rtc_read_time,
+ .set_time = integrator_rtc_set_time,
+ .read_alarm = integrator_rtc_read_alarm,
+ .set_alarm = integrator_rtc_set_alarm,
};
static irqreturn_t arm_rtc_interrupt(int irq, void *dev_id,
--
next prev parent reply other threads:[~2006-03-06 1:53 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-06 1:50 [PATCH 00/16] RTC subsystem Alessandro Zummo
2006-03-06 1:50 ` [PATCH 01/16] RTC Subsystem, library functions Alessandro Zummo
2006-03-09 1:28 ` Adrian Bunk
2006-03-09 1:39 ` Alessandro Zummo
2006-03-06 1:50 ` [PATCH 02/16] RTC subsystem, ARM cleanup Alessandro Zummo
2006-03-06 1:50 ` Alessandro Zummo [this message]
2006-03-06 1:50 ` [PATCH 04/16] RTC subsystem, MIPS cleanup Alessandro Zummo
2006-03-06 1:50 ` [PATCH 05/16] RTC subsystem, class Alessandro Zummo
2006-03-06 1:50 ` [PATCH 06/16] RTC subsystem, I2C cleanup Alessandro Zummo
2006-03-06 1:50 ` [PATCH 07/16] RTC subsystem, sysfs interface Alessandro Zummo
2006-03-06 1:50 ` [PATCH 08/16] RTC subsystem, proc interface Alessandro Zummo
2006-03-06 1:50 ` [PATCH 09/16] RTC subsystem, dev interface Alessandro Zummo
2006-03-06 1:50 ` [PATCH 10/16] RTC subsystem, X1205 driver Alessandro Zummo
2006-03-06 1:50 ` [PATCH 11/16] RTC subsystem, test device/driver Alessandro Zummo
2006-03-06 1:50 ` [PATCH 12/16] RTC subsystem, DS1672 driver Alessandro Zummo
2006-03-06 1:50 ` [PATCH 13/16] RTC subsystem, PCF8563 driver Alessandro Zummo
2006-03-06 1:50 ` [PATCH 14/16] RTC subsystem, RS5C372 driver Alessandro Zummo
2006-03-06 1:50 ` [PATCH 15/16] RTC subsystem, EP93XX driver Alessandro Zummo
2006-03-06 1:50 ` [PATCH 16/16] RTC subsystem, SA1100/PXA2XX driver Alessandro Zummo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060306015009.487349000@towertech.it \
--to=a.zummo@towertech.it \
--cc=akpm@digeo.com \
--cc=akpm@zip.com.au \
--cc=linux-kernel@vger.kernel.org \
--cc=rpurdie@rpsys.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox