From patchwork Thu Sep 20 13:14:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 1485001 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 43B15E0012 for ; Thu, 20 Sep 2012 13:14:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751807Ab2ITNOr (ORCPT ); Thu, 20 Sep 2012 09:14:47 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:64557 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752107Ab2ITNOq (ORCPT ); Thu, 20 Sep 2012 09:14:46 -0400 Received: by bkuw11 with SMTP id w11so208338bku.19 for ; Thu, 20 Sep 2012 06:14:45 -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:x-gm-message-state; bh=psyX+6hrKcu2HONzyWtO0nnRSElfEimgkEfkgDO5kgY=; b=AZTmikxBUAgJgSZjHviCv+FZkOqvgP+6JHIX1ELys2hxRhoCqmJDKVvkd9M8UCbQIC YNN1O6FRkrbMPPgRqK9+Iqup4O+j08hmw2JsruJ9KlZbRPDY53z/QlImG5VVvNrKhBFP TGk/RFtzqYl4u0zpL7C+x+Y4ks+G3BbMVP9iM0H2+IkiCYEz353mkQaq4OdEo4ynY9A/ 21Q2+2mBTH1To1S7FuE5rZU+odDT6EnDL8ZvuNKbt4k9g0++wDVilf0jjNn24FBaSg1T zTnU+S0r8HBc0S7hSjCdMjUJFZUdTdlCgxPT7GHmLZe/K7+m0pCipijSiW69ilnrqXjG NM2Q== Received: by 10.204.7.91 with SMTP id c27mr666475bkc.17.1348146884805; Thu, 20 Sep 2012 06:14:44 -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 t27sm887074bkv.10.2012.09.20.06.14.42 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Sep 2012 06:14:43 -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 1/2][RFC] cpuidle : move driver's refcount to cpuidle Date: Thu, 20 Sep 2012 15:14:39 +0200 Message-Id: <1348146880-17320-1-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.5.4 X-Gm-Message-State: ALoCoQlQQ+8dCF3thSN77K52SFGsqnqZMw9A+hh2Qz4Tz0J6zwv/yLyrQY5h8B+9HBE43MJ6CJSs Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org In the next patch, we will support different cpuidle drivers tied with a cpu. In this case we should move the refcount to the cpuidle_driver structure to handle several drivers at a time. Signed-off-by: Daniel Lezcano --- drivers/cpuidle/driver.c | 11 ++++++----- include/linux/cpuidle.h | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c index 87db387..676febd 100644 --- a/drivers/cpuidle/driver.c +++ b/drivers/cpuidle/driver.c @@ -16,7 +16,6 @@ static struct cpuidle_driver *cpuidle_curr_driver; DEFINE_SPINLOCK(cpuidle_driver_lock); -int cpuidle_driver_refcount; static void set_power_states(struct cpuidle_driver *drv) { @@ -92,7 +91,7 @@ void cpuidle_unregister_driver(struct cpuidle_driver *drv) spin_lock(&cpuidle_driver_lock); - if (!WARN_ON(cpuidle_driver_refcount > 0)) + if (!WARN_ON(drv->refcnt > 0)) cpuidle_curr_driver = NULL; spin_unlock(&cpuidle_driver_lock); @@ -106,7 +105,7 @@ struct cpuidle_driver *cpuidle_driver_ref(void) spin_lock(&cpuidle_driver_lock); drv = cpuidle_curr_driver; - cpuidle_driver_refcount++; + drv->refcnt++; spin_unlock(&cpuidle_driver_lock); return drv; @@ -114,10 +113,12 @@ struct cpuidle_driver *cpuidle_driver_ref(void) void cpuidle_driver_unref(void) { + struct cpuidle_driver *drv = cpuidle_curr_driver; + spin_lock(&cpuidle_driver_lock); - if (!WARN_ON(cpuidle_driver_refcount <= 0)) - cpuidle_driver_refcount--; + if (drv && !WARN_ON(drv->refcnt <= 0)) + drv->refcnt--; spin_unlock(&cpuidle_driver_lock); } diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 279b1ea..a4ff9f8 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -131,6 +131,7 @@ static inline int cpuidle_get_last_residency(struct cpuidle_device *dev) struct cpuidle_driver { const char *name; struct module *owner; + int refcnt; unsigned int power_specified:1; /* set to 1 to use the core cpuidle time keeping (for all states). */