From patchwork Fri Jan 11 23:46:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 14011 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id F28EA23ED1 for ; Fri, 11 Jan 2013 23:46:39 +0000 (UTC) Received: from mail-vb0-f52.google.com (mail-vb0-f52.google.com [209.85.212.52]) by fiordland.canonical.com (Postfix) with ESMTP id 97A3BA18170 for ; Fri, 11 Jan 2013 23:46:39 +0000 (UTC) Received: by mail-vb0-f52.google.com with SMTP id ez10so1986389vbb.11 for ; Fri, 11 Jan 2013 15:46:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:mime-version:content-type :content-transfer-encoding:x-gm-message-state; bh=GgUtUtZ3NKtI5JHPTb/yc6Kfa/dPSQbX1HyMeHh0/wI=; b=mc7STg0aVp509xmdorHNTRIvrR71+xriK2y/n1WAbpvauBHSAtaNdzE1Zym12yp63T 9SYHhK1tRl/17tw+XZSJeIhhEAQZ5a5HOS6IutsuUT+Z+2UIFmsBkOYCFZP7PKx5vwsh Vku8D5io3vY9XziNpUpwVDSibS26Ee89YtpltmG0NYr7LVMOV80VJrSQTpcNSWu1OkkX JqHCF2oMfcAA6h3bdrvE3y6MjXomIe6BO4kGsH7DJ2iOqE+MZ/qyacuAsf4puFW6qh03 fg++j8wRJCXZqgb1i/ME4Q359qwG6d5p5hDCtyqp/33JkvlorA/SHuEBg380obpWkuSP 6aeA== X-Received: by 10.220.218.197 with SMTP id hr5mr93798322vcb.8.1357947999102; Fri, 11 Jan 2013 15:46:39 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.145.101 with SMTP id st5csp137219veb; Fri, 11 Jan 2013 15:46:38 -0800 (PST) X-Received: by 10.66.82.73 with SMTP id g9mr211774393pay.5.1357947997565; Fri, 11 Jan 2013 15:46:37 -0800 (PST) Received: from mail-pb0-f45.google.com (mail-pb0-f45.google.com [209.85.160.45]) by mx.google.com with ESMTPS id n6si6737008paw.312.2013.01.11.15.46.37 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Jan 2013 15:46:37 -0800 (PST) Received-SPF: neutral (google.com: 209.85.160.45 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=209.85.160.45; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.45 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) smtp.mail=john.stultz@linaro.org Received: by mail-pb0-f45.google.com with SMTP id mc8so1210381pbc.4 for ; Fri, 11 Jan 2013 15:46:37 -0800 (PST) X-Received: by 10.66.89.199 with SMTP id bq7mr211322502pab.26.1357947994998; Fri, 11 Jan 2013 15:46:34 -0800 (PST) Received: from localhost.localdomain (c-24-21-54-107.hsd1.or.comcast.net. [24.21.54.107]) by mx.google.com with ESMTPS id ir4sm3558611pbc.41.2013.01.11.15.46.33 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Jan 2013 15:46:34 -0800 (PST) From: John Stultz To: linux-kernel@vger.kernel.org Cc: John Stultz , Greg KH , Serban Constantinescu , =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Colin Cross , Android Kernel Team Subject: [RFC][PATCH 1/3] staging: alarm-dev: Drop pre Android 1.0 _OLD ioctls Date: Fri, 11 Jan 2013 15:46:22 -0800 Message-Id: <1357947984-15611-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1357947984-15611-1-git-send-email-john.stultz@linaro.org> References: <1357947984-15611-1-git-send-email-john.stultz@linaro.org> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQnWendAjfxQTF7k5sb7CZwXhFFj8z3+j5LSdYrETkgW40G/d8XKFnhCgdlfafQxUYKzvFy8 Per Colin's comment: "The "support old userspace code" comment for those two ioctls has been there since pre-Android 1.0. Those apis are not exposed to Android apps, I don't see any problem deleting them." Thus this patch removes the ANDROID_ALARM_SET_OLD and ANDROID_ALARM_SET_AND_WAIT_OLD ioctl compatability logic. Cc: Greg KH Cc: Serban Constantinescu Cc: Arve Hjønnevåg Cc: Colin Cross Cc: Android Kernel Team Signed-off-by: John Stultz --- drivers/staging/android/alarm-dev.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/drivers/staging/android/alarm-dev.c b/drivers/staging/android/alarm-dev.c index a9b293f..d423850 100644 --- a/drivers/staging/android/alarm-dev.c +++ b/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 @@ from_old_alarm_set: 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: