The patch titled
rtc-class-driver-for-samsung-s3c-series-soc-tidy
has been removed from the -mm tree. Its filename is
rtc-class-driver-for-samsung-s3c-series-soc-tidy.patch
This patch was dropped because it was folded into rtc-class-driver-for-samsung-s3c-series-soc.patch
------------------------------------------------------
Subject: rtc-class-driver-for-samsung-s3c-series-soc-tidy
From: Andrew Morton <akpm@xxxxxxxx>
Cc: Ben Dooks <ben-linux@xxxxxxxxx>
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Cc: Russell King <rmk@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/rtc/rtc-s3c.c | 36 ++++++++++++++----------------------
1 files changed, 14 insertions(+), 22 deletions(-)
diff -puN drivers/rtc/rtc-s3c.c~rtc-class-driver-for-samsung-s3c-series-soc-tidy drivers/rtc/rtc-s3c.c
--- a/drivers/rtc/rtc-s3c.c~rtc-class-driver-for-samsung-s3c-series-soc-tidy
+++ a/drivers/rtc/rtc-s3c.c
@@ -34,9 +34,6 @@
/* I have yet to find an S3C implementation with more than one
* of these rtc blocks in */
-#undef S3C24XX_VA_RTC
-#define S3C24XX_VA_RTC s3c_rtc_base
-
static struct resource *s3c_rtc_mem;
static void __iomem *s3c_rtc_base;
@@ -45,6 +42,7 @@ static int s3c_rtc_tickno = NO_IRQ;
static int s3c_rtc_freq = 1;
static DEFINE_SPINLOCK(s3c_rtc_pie_lock);
+static unsigned int tick_count;
/* IRQ Handlers */
@@ -56,8 +54,6 @@ static irqreturn_t s3c_rtc_alarmirq(int
return IRQ_HANDLED;
}
-static unsigned int tick_count;
-
static irqreturn_t s3c_rtc_tickirq(int irq, void *id, struct pt_regs *r)
{
struct rtc_device *rdev = id;
@@ -153,7 +149,6 @@ static int s3c_rtc_gettime(struct device
return 0;
}
-
static int s3c_rtc_settime(struct device *dev, struct rtc_time *tm)
{
/* the rtc gets round the y2k problem by just not supporting it */
@@ -193,29 +188,25 @@ static int s3c_rtc_getalarm(struct devic
/* decode the alarm enable field */
- if (alm_en & S3C2410_RTCALM_SECEN) {
+ if (alm_en & S3C2410_RTCALM_SECEN)
BCD_TO_BIN(alm_tm->tm_sec);
- } else {
+ else
alm_tm->tm_sec = 0xff;
- }
- if (alm_en & S3C2410_RTCALM_MINEN) {
+ if (alm_en & S3C2410_RTCALM_MINEN)
BCD_TO_BIN(alm_tm->tm_min);
- } else {
+ else
alm_tm->tm_min = 0xff;
- }
- if (alm_en & S3C2410_RTCALM_HOUREN) {
+ if (alm_en & S3C2410_RTCALM_HOUREN)
BCD_TO_BIN(alm_tm->tm_hour);
- } else {
+ else
alm_tm->tm_hour = 0xff;
- }
- if (alm_en & S3C2410_RTCALM_DAYEN) {
+ if (alm_en & S3C2410_RTCALM_DAYEN)
BCD_TO_BIN(alm_tm->tm_mday);
- } else {
+ else
alm_tm->tm_mday = 0xff;
- }
if (alm_en & S3C2410_RTCALM_MONEN) {
BCD_TO_BIN(alm_tm->tm_mon);
@@ -224,11 +215,10 @@ static int s3c_rtc_getalarm(struct devic
alm_tm->tm_mon = 0xff;
}
- if (alm_en & S3C2410_RTCALM_YEAREN) {
+ if (alm_en & S3C2410_RTCALM_YEAREN)
BCD_TO_BIN(alm_tm->tm_year);
- } else {
+ else
alm_tm->tm_year = 0xffff;
- }
return 0;
}
@@ -352,8 +342,10 @@ static int s3c_rtc_open(struct device *d
ret = request_irq(s3c_rtc_alarmno, s3c_rtc_alarmirq,
SA_INTERRUPT, "s3c2410-rtc alarm", rtc_dev);
- if (ret)
+ if (ret) {
dev_err(dev, "IRQ%d error %d\n", s3c_rtc_alarmno, ret);
+ return ret;
+ }
ret = request_irq(s3c_rtc_tickno, s3c_rtc_tickirq,
SA_INTERRUPT, "s3c2410-rtc tick", rtc_dev);
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
rtc-class-driver-for-samsung-s3c-series-soc.patch
rtc-class-driver-for-samsung-s3c-series-soc-tidy.patch
hotcpu_notifier-fixes.patch
add-___rodata-sections-to-asm-generic-sectionsh-fix.patch
edac-new-opteron-athlon64-memory-controller-driver-tidy.patch
pnp-suppress-request_irq-warning.patch
reiserfs-on-demand-bitmap-loading-fix.patch
per-task-delay-accounting-taskstats-interface-tidy.patch
per-task-delay-accounting-proc-export-of-aggregated-block-i-o-delays-warning-fix.patch
delay-accounting-taskstats-interface-send-tgid-once-fixes.patch
swap_prefetch-vs-zoned-counters.patch
mark-address_space_operations-const-vs-ecryptfs-mmap-operations.patch
ecryptfs-alpha-build-fix.patch
ecryptfs-more-elegant-aes-key-size-manipulation-tidy.patch
ecryptfs-get_sb_dev-fix.patch
namespaces-add-nsproxy-dont-include-compileh.patch
namespaces-utsname-switch-to-using-uts-namespaces-alpha-fix.patch
namespaces-utsname-use-init_utsname-when-appropriate-cifs-update.patch
namespaces-utsname-implement-utsname-namespaces-export.patch
namespaces-utsname-implement-utsname-namespaces-dont-include-compileh.patch
namespaces-utsname-sysctl-hack-cleanup-2-fix.patch
ipc-namespace-core-fix.patch
task-watchers-task-watchers-tidy.patch
task-watchers-add-support-for-per-task-watchers-warning-fix.patch
readahead-sysctl-parameters-fix.patch
make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch
reiser4-hardirq-include-fix.patch
reiser4-run-truncate_inode_pages-in-reiser4_delete_inode.patch
reiser4-get_sb_dev-fix.patch
reiser4-vs-zoned-allocator.patch
hpt3xx-rework-rate-filtering-tidy.patch
genirq-convert-the-i386-architecture-to-irq-chips-fix-2.patch
genirq-x86_64-irq-reenable-migrating-irqs-to-other-cpus-fix.patch
genirq-msi-simplify-msi-enable-and-disable-fix.patch
genirq-ia64-irq-dynamic-irq-support-fix.patch
genirq-i386-irq-remove-the-msi-assumption-that-irq-==-vector-fix-tidies.patch
srcu-rcu-variant-permitting-read-side-blocking-fixes.patch
srcu-add-srcu-operations-to-rcutorture-fix.patch
srcu-2-add-srcu-operations-to-rcutorture-fix.patch
make-more-file_operation-structs-static-fix.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
revert-tty-buffering-comment-out-debug-code.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
