From patchwork Fri Feb 1 13:48:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 14403 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 7788D23E39 for ; Fri, 1 Feb 2013 13:48:36 +0000 (UTC) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by fiordland.canonical.com (Postfix) with ESMTP id 2B8C7A18275 for ; Fri, 1 Feb 2013 13:48:36 +0000 (UTC) Received: by mail-vc0-f181.google.com with SMTP id d16so2418639vcd.26 for ; Fri, 01 Feb 2013 05:48:35 -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:x-gm-message-state; bh=Gzh3prByEGZ857dULDVpIRxvVy9JFRJQzQHAeeRyUC4=; b=RV2or3MRwevt5cxEeNld+gjmKAl5kPSok+V9GKe010mYi4YD0FA/ls7Gk5fQhG9nST y2iuPx9dxpLCXSG2IRf7CWeXAzK2/yKhkvjkkfapw9UHJwDXDrIf7CnJN9kXedb9E95E SGyw5T3u0AWWMdi4MfybyXuXDJmkV7fNmHBV8xmfMiwe4HvJmtwNot1Tsv+6MU9Xdld9 znzPdvsZcEmICHdexULpsYufnqQB3Sh0pPPvscB52yw/YidPeYv+tp59URDEUnNrCynu EzrGUpf1+pwwvb00h2x4U5/igA/KZ1Pzc27fq2KN8j/N14k5UTOi4FzwwvN9pTJNiLIv Cy6w== X-Received: by 10.220.153.143 with SMTP id k15mr11203828vcw.33.1359726515645; Fri, 01 Feb 2013 05:48:35 -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.252.8 with SMTP id zo8csp117372vec; Fri, 1 Feb 2013 05:48:34 -0800 (PST) X-Received: by 10.180.83.227 with SMTP id t3mr3085937wiy.2.1359726510118; Fri, 01 Feb 2013 05:48:30 -0800 (PST) Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by mx.google.com with ESMTPS id l3si2925924wjy.26.2013.02.01.05.48.29 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 01 Feb 2013 05:48:30 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.182 is neither permitted nor denied by best guess record for domain of daniel.lezcano@linaro.org) client-ip=209.85.212.182; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.182 is neither permitted nor denied by best guess record for domain of daniel.lezcano@linaro.org) smtp.mail=daniel.lezcano@linaro.org Received: by mail-wi0-f182.google.com with SMTP id hn14so594020wib.15 for ; Fri, 01 Feb 2013 05:48:29 -0800 (PST) X-Received: by 10.180.87.98 with SMTP id w2mr3009300wiz.30.1359726501608; Fri, 01 Feb 2013 05:48:21 -0800 (PST) Received: from mai.home (AToulouse-654-1-332-150.w86-199.abo.wanadoo.fr. [86.199.219.150]) by mx.google.com with ESMTPS id bd7sm3692703wib.8.2013.02.01.05.48.20 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 01 Feb 2013 05:48:20 -0800 (PST) From: Daniel Lezcano To: nsekhar@ti.com, khilman@ti.com Cc: patches@linaro.org, linaro-dev@lists.linaro.org, davinci-linux-open-source@linux.davincidsp.com, lenb@kernel.org, linux-pm@vger.kernel.org Subject: [PATCH 3/4] davinci: cpuidle - remove the ops Date: Fri, 1 Feb 2013 14:48:14 +0100 Message-Id: <1359726495-8024-4-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1359726495-8024-1-git-send-email-daniel.lezcano@linaro.org> References: <1359726495-8024-1-git-send-email-daniel.lezcano@linaro.org> X-Gm-Message-State: ALoCoQk8wE1h58nquYWQ7hvs19wqQuC6AALCKnwx+rmG4zBV5NuwHTWwO0kejc2uzPvvtnk0x8Ed With one function handling the idle state and a single variable, the usage of the davinci_ops is overkill. This patch removes these ops and simplify the code. Furthermore, the 'driver_data' field is no longer used, we have 1 of the 3 remaining user of this field removed. Signed-off-by: Daniel Lezcano --- arch/arm/mach-davinci/cpuidle.c | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/arch/arm/mach-davinci/cpuidle.c b/arch/arm/mach-davinci/cpuidle.c index 9438672..28cc8e8 100644 --- a/arch/arm/mach-davinci/cpuidle.c +++ b/arch/arm/mach-davinci/cpuidle.c @@ -25,12 +25,6 @@ #define DAVINCI_CPUIDLE_MAX_STATES 2 -struct davinci_ops { - void (*enter) (void); - void (*exit) (void); - u32 flags; -}; - static DEFINE_PER_CPU(struct cpuidle_device, davinci_cpuidle_device); static void __iomem *ddr2_reg_base; static bool ddr2_pdown = false; @@ -54,39 +48,17 @@ static void davinci_save_ddr_power(int enter, bool pdown) __raw_writel(val, ddr2_reg_base + DDR2_SDRCR_OFFSET); } -static void davinci_c2state_enter(void) -{ - davinci_save_ddr_power(1, ddr2_pdown); -} - -static void davinci_c2state_exit(void) -{ - davinci_save_ddr_power(0, ddr2_pdown); -} - -static struct davinci_ops davinci_states[DAVINCI_CPUIDLE_MAX_STATES] = { - [1] = { - .enter = davinci_c2state_enter, - .exit = davinci_c2state_exit, - }, -}; - /* Actual code that puts the SoC in different idle states */ static int davinci_enter_idle(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) { - struct cpuidle_state_usage *state_usage = &dev->states_usage[index]; - struct davinci_ops *ops = cpuidle_get_statedata(state_usage); - - if (ops && ops->enter) - ops->enter(); + davinci_save_ddr_power(1, ddr2_pdown); index = cpuidle_wrap_enter(dev, drv, index, arm_cpuidle_simple_enter); - if (ops && ops->exit) - ops->exit(); + davinci_save_ddr_power(0, ddr2_pdown); return index; } @@ -123,7 +95,6 @@ static int __init davinci_cpuidle_probe(struct platform_device *pdev) ddr2_reg_base = pdata->ddr2_ctlr_base; ddr2_pdown = pdata->ddr2_pdown; - cpuidle_set_statedata(&device->states_usage[1], &davinci_states[1]); device->state_count = DAVINCI_CPUIDLE_MAX_STATES;