From patchwork Tue Sep 18 03:12:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 11488 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 E5EF823F98 for ; Tue, 18 Sep 2012 03:13:12 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id F030EA18525 for ; Tue, 18 Sep 2012 03:13:11 +0000 (UTC) Received: by ieak11 with SMTP id k11so10230992iea.11 for ; Mon, 17 Sep 2012 20:13:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding:x-cbid :x-gm-message-state; bh=vILvINSZOi00vVcx029qAlPj4PCVQgBdch2K8bT+jfA=; b=NEfOhufANP4MSjBVOz14VuG5rx09vFfhAOZCCzQqXHyRhcUEF+kcnxCmoTeq59we1U iCKdDRfTYXdu0dmf1eQiZGQX2KYYMBjPo0YKhBnYU6xxExt4uK+nUolvID6w/cfd7EAm b2FAYdRl6NxfyRv+aEz7TEYs7XAXbLccAJRHCiqw99T4cTCP7n5gXrF5RHONgUH9Aopo JRYsbyWlscZe6/nsipSPNVrBLQQGN56U6PFu5agnfLaR6tm0wcg1EqVKUapLdM8qAvbv fUeqcGjMnHh8IpffHLaosjjWPVUXtvtDk+1mgpXUuZpV+dwYrIGnq/2XQTVyjH5IaWTC kRQw== Received: by 10.50.191.227 with SMTP id hb3mr8888854igc.43.1347937991289; Mon, 17 Sep 2012 20:13:11 -0700 (PDT) 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.50.184.232 with SMTP id ex8csp350835igc; Mon, 17 Sep 2012 20:13:10 -0700 (PDT) Received: by 10.50.195.234 with SMTP id ih10mr8868774igc.21.1347937990084; Mon, 17 Sep 2012 20:13:10 -0700 (PDT) Received: from e9.ny.us.ibm.com (e9.ny.us.ibm.com. [32.97.182.139]) by mx.google.com with ESMTPS id nj8si12966123igc.73.2012.09.17.20.13.09 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Sep 2012 20:13:10 -0700 (PDT) Received-SPF: neutral (google.com: 32.97.182.139 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=32.97.182.139; Authentication-Results: mx.google.com; spf=neutral (google.com: 32.97.182.139 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) smtp.mail=john.stultz@linaro.org Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 17 Sep 2012 23:13:09 -0400 Received: from d01relay05.pok.ibm.com (9.56.227.237) by e9.ny.us.ibm.com (192.168.1.109) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 17 Sep 2012 23:13:08 -0400 Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q8I3D7Kj155412; Mon, 17 Sep 2012 23:13:07 -0400 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q8I3D767011852; Tue, 18 Sep 2012 00:13:07 -0300 Received: from kernel-pok.stglabs.ibm.com (kernel.stglabs.ibm.com [9.114.214.19]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q8I3D65P011794; Tue, 18 Sep 2012 00:13:07 -0300 From: John Stultz To: Linux Kernel Cc: John Stultz , =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Colin Cross , Thomas Gleixner Subject: [PATCH 3/3] alarmtimer: Rename alarmtimer_remove to alarmtimer_dequeue Date: Mon, 17 Sep 2012 23:12:55 -0400 Message-Id: <1347937975-34169-4-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1347937975-34169-1-git-send-email-john.stultz@linaro.org> References: <1347937975-34169-1-git-send-email-john.stultz@linaro.org> MIME-Version: 1.0 x-cbid: 12091803-7182-0000-0000-000002A5C0CF X-Gm-Message-State: ALoCoQlaFYBB2i0RqFG+t7QTgZsmvTyuXhTzS3L8n0rZILSG328nbflv6qnWKxoqcVibNGWURT+Q Now that alarmtimer_remove has been simplified, change its name to _dequeue to better match its paired _enqueue function. Cc: Arve Hjønnevåg Cc: Colin Cross Cc: Thomas Gleixner Signed-off-by: John Stultz --- kernel/time/alarmtimer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index 8c763ac..d14f833 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -142,7 +142,7 @@ static void alarmtimer_enqueue(struct alarm_base *base, struct alarm *alarm) } /** - * alarmtimer_remove - Removes an alarm timer from an alarm_base timerqueue + * alarmtimer_dequeue - Removes an alarm timer from an alarm_base timerqueue * @base: pointer to the base where the timer is running * @alarm: pointer to alarm being removed * @@ -150,7 +150,7 @@ static void alarmtimer_enqueue(struct alarm_base *base, struct alarm *alarm) * * Must hold base->lock when calling. */ -static void alarmtimer_remove(struct alarm_base *base, struct alarm *alarm) +static void alarmtimer_dequeue(struct alarm_base *base, struct alarm *alarm) { if (!(alarm->state & ALARMTIMER_STATE_ENQUEUED)) return; @@ -178,7 +178,7 @@ static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer) int restart = ALARMTIMER_NORESTART; spin_lock_irqsave(&base->lock, flags); - alarmtimer_remove(base, alarm); + alarmtimer_dequeue(base, alarm); spin_unlock_irqrestore(&base->lock, flags); if (alarm->function) @@ -332,7 +332,7 @@ int alarm_try_to_cancel(struct alarm *alarm) spin_lock_irqsave(&base->lock, flags); ret = hrtimer_try_to_cancel(&alarm->timer); if (ret >= 0) - alarmtimer_remove(base, alarm); + alarmtimer_dequeue(base, alarm); spin_unlock_irqrestore(&base->lock, flags); return ret; }