From patchwork Wed Sep 19 17:22:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 1478741 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id DE5A93FE79 for ; Wed, 19 Sep 2012 17:22:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932295Ab2ISRW4 (ORCPT ); Wed, 19 Sep 2012 13:22:56 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:53396 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932589Ab2ISRWz (ORCPT ); Wed, 19 Sep 2012 13:22:55 -0400 Received: by wgbdr13 with SMTP id dr13so1029694wgb.1 for ; Wed, 19 Sep 2012 10:22:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=ChGrd2gYkTS687Uc5wy5RH9osO1F452QWx/SVA1D1sU=; b=JesSurofkmgG5E+oaKeenzaZoH5oszkh5I9Cbj0ZMZ4zUUxlLRMtDfMCNdJEGXHlT/ 6MSBmdsFBSpVdAdFGpSBYVIE9jPCzx4Y41viFzPZI1lYqE1TWf9bKQ/qMNqbV84Tf/IS ZD8SsJ7nB7BrL9tk05RSesfnCZdA7CLexYDRXf8yGiedoIjOts+G9wrb3V48DejCJRsj qEsc/+hkLZwQiW9tc7iAuTXkRiWw6TOeGKhrh5eXwLV0ZLduJlx3iFhWz7TkDjjZditM 4hgX/tbrjSVxo4FDEjRsH7D6ToJiFp00le6egrE8/ZNOLhOFGiY7ip8lYrgqNGWlDpid joDQ== Received: by 10.216.140.213 with SMTP id e63mr2173077wej.48.1348075374368; Wed, 19 Sep 2012 10:22:54 -0700 (PDT) Received: from localhost.localdomain (AToulouse-651-1-259-252.w109-214.abo.wanadoo.fr. [109.214.174.252]) by mx.google.com with ESMTPS id r9sm5977769wia.2.2012.09.19.10.22.52 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 19 Sep 2012 10:22:53 -0700 (PDT) From: Daniel Lezcano To: rjw@sisk.pl, lenb@kernel.org Cc: linux-pm@vger.kernel.org, linux-acpi@vger.kernel.org, patches@linaro.org, linaro-dev@lists.linaro.org Subject: [PATCH 2/3] cpuidle : rename function name "__cpuidle_register_driver" Date: Wed, 19 Sep 2012 19:22:48 +0200 Message-Id: <1348075369-16451-2-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1348075369-16451-1-git-send-email-daniel.lezcano@linaro.org> References: <1348075369-16451-1-git-send-email-daniel.lezcano@linaro.org> X-Gm-Message-State: ALoCoQk6EmTQ5YjfCxv/+uhnHFkdc3YAoLx9v2wU7zfZrkyOaXaFPS1K4oB7M6qcKrQuUhnH+O8A Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Clarify the purpose of the function by changing its name and move the condition out of this function. Signed-off-by: Daniel Lezcano --- drivers/cpuidle/driver.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c index 40cd3f3..774d2cb 100644 --- a/drivers/cpuidle/driver.c +++ b/drivers/cpuidle/driver.c @@ -17,9 +17,10 @@ static struct cpuidle_driver *cpuidle_curr_driver; DEFINE_SPINLOCK(cpuidle_driver_lock); -static void __cpuidle_register_driver(struct cpuidle_driver *drv) +static void set_power_states(struct cpuidle_driver *drv) { int i; + /* * cpuidle driver should set the drv->power_specified bit * before registering if the driver provides @@ -34,10 +35,8 @@ static void __cpuidle_register_driver(struct cpuidle_driver *drv) * an power value of -1. So we use -2, -3, etc, for other * c-states. */ - if (!drv->power_specified) { - for (i = CPUIDLE_DRIVER_STATE_START; i < drv->state_count; i++) - drv->states[i].power_usage = -1 - i; - } + for (i = CPUIDLE_DRIVER_STATE_START; i < drv->state_count; i++) + drv->states[i].power_usage = -1 - i; } @@ -58,8 +57,10 @@ int cpuidle_register_driver(struct cpuidle_driver *drv) spin_unlock(&cpuidle_driver_lock); return -EBUSY; } - __cpuidle_register_driver(drv); - cpuidle_curr_driver = drv; + + if (!drv->power_specified) + set_power_states(drv); + spin_unlock(&cpuidle_driver_lock); return 0;