From da6a08ed8976cedd0527dad8298231bf61147b37 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Fri, 11 Jan 2013 15:46:22 -0800 Subject: [PATCH] --- yaml --- r: 354047 b: refs/heads/master c: be1a3e38ad7ba682f1a71e61ba16289061627217 h: refs/heads/master i: 354045: fd26073998783a1ac415c2f7f80a22e9032cdf8e 354043: 34372dc1bfadfab70b1d1a86fdf817ade6b43cf5 354039: e68a69ced3e0c5d66f785794a29ddde2c905e2d0 354031: 3d928a056d35f904ab9d1f7db1c660108dface2b 354015: f8150dcdd3bdd0c4989c7d25901f6a837a3ea1cb 353983: bda895f7070e502311776ce8bbe803b7f28f6dc8 353919: 1d28a6fae4a26538f33a1849fea9678545d81537 353791: f60c668283ba8d8ee2d85f265b72009731d86325 v: v3 --- [refs] | 2 +- trunk/drivers/staging/android/alarm-dev.c | 18 ++---------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 4cc0be8b42f1..2b5a712a4999 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 952bf230a5d8bae3ffc27c9b91b2475eda909727 +refs/heads/master: be1a3e38ad7ba682f1a71e61ba16289061627217 diff --git a/trunk/drivers/staging/android/alarm-dev.c b/trunk/drivers/staging/android/alarm-dev.c index a9b293ff3cc8..d423850dd28a 100644 --- a/trunk/drivers/staging/android/alarm-dev.c +++ b/trunk/drivers/staging/android/alarm-dev.c @@ -42,10 +42,6 @@ do { \ ANDROID_ALARM_RTC_WAKEUP_MASK | \ ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP_MASK) -/* support old userspace code */ -#define ANDROID_ALARM_SET_OLD _IOW('a', 2, time_t) /* set alarm */ -#define ANDROID_ALARM_SET_AND_WAIT_OLD _IOW('a', 3, time_t) - static int alarm_opened; static DEFINE_SPINLOCK(alarm_slock); static struct wakeup_source alarm_wake_lock; @@ -142,15 +138,6 @@ static long alarm_ioctl(struct file *file, unsigned int cmd, unsigned long arg) spin_unlock_irqrestore(&alarm_slock, flags); break; - case ANDROID_ALARM_SET_OLD: - case ANDROID_ALARM_SET_AND_WAIT_OLD: - if (get_user(new_alarm_time.tv_sec, (int __user *)arg)) { - rv = -EFAULT; - goto err1; - } - new_alarm_time.tv_nsec = 0; - goto from_old_alarm_set; - case ANDROID_ALARM_SET_AND_WAIT(0): case ANDROID_ALARM_SET(0): if (copy_from_user(&new_alarm_time, (void __user *)arg, @@ -158,7 +145,6 @@ static long alarm_ioctl(struct file *file, unsigned int cmd, unsigned long arg) rv = -EFAULT; goto err1; } -from_old_alarm_set: spin_lock_irqsave(&alarm_slock, flags); alarm_dbg(IO, "alarm %d set %ld.%09ld\n", alarm_type, @@ -167,8 +153,8 @@ static long alarm_ioctl(struct file *file, unsigned int cmd, unsigned long arg) devalarm_start(&alarms[alarm_type], timespec_to_ktime(new_alarm_time)); spin_unlock_irqrestore(&alarm_slock, flags); - if (ANDROID_ALARM_BASE_CMD(cmd) != ANDROID_ALARM_SET_AND_WAIT(0) - && cmd != ANDROID_ALARM_SET_AND_WAIT_OLD) + if (ANDROID_ALARM_BASE_CMD(cmd) != + ANDROID_ALARM_SET_AND_WAIT(0)) break; /* fall though */ case ANDROID_ALARM_WAIT: