From patchwork Fri Mar 29 10:31:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 2364961 Return-Path: X-Original-To: patchwork-linux-pm@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 058D6DFB79 for ; Fri, 29 Mar 2013 10:31:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753019Ab3C2Kbr (ORCPT ); Fri, 29 Mar 2013 06:31:47 -0400 Received: from mail-wg0-f41.google.com ([74.125.82.41]:61230 "EHLO mail-wg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753051Ab3C2Kbq (ORCPT ); Fri, 29 Mar 2013 06:31:46 -0400 Received: by mail-wg0-f41.google.com with SMTP id y10so350612wgg.2 for ; Fri, 29 Mar 2013 03:31:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=iSdTKqGWkKs+8C++oUkknDzm7eCR3KTcxN9JalVYkrk=; b=eZizypPzcvADYfNp5Mi0CQlk0p62YOmooHI/ExFt8DO8FkH9onN5T9sKudmg6nYMsd zzGZiTqWILEQqOGqMCV5bjtzYY0fYTTQ36wO+FRVeAuGEspIwvId4KHOAtFQMcLTUWFD aU5FWC6cnTI5NNOWtqw6wBdjxWofFukVaWPGSLGpTv3m4KbLmnOGgH0wXAtcJDMyJsn8 tD/gg5hYGIfLzCc/uUpu6GlSkU/u2Q0PVTm2bpjljGchWisZT/kEOSQsUQYbcXBlGZWj YSw80Se+FtiJu6c5yaDwhTQBDXLKuamopvHVr45LT1cSnKci3wlf0yC3Jfl4w7bLmQDI ywNA== X-Received: by 10.180.92.97 with SMTP id cl1mr21479041wib.19.1364553105263; Fri, 29 Mar 2013 03:31:45 -0700 (PDT) Received: from mai.home (AToulouse-654-1-486-7.w92-146.abo.wanadoo.fr. [92.146.77.7]) by mx.google.com with ESMTPS id q13sm2472076wie.0.2013.03.29.03.31.43 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 29 Mar 2013 03:31:44 -0700 (PDT) From: Daniel Lezcano To: rjw@sisk.pl Cc: linux-pm@vger.kernel.org, patches@linaro.org, linaro-kernel@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux@arm.linux.org.uk, rnayak@ti.com, swarren@wwwdotorg.org, linux-tegra@vger.kernel.org, horms+renesas@verge.net.au, santosh.shilimkar@ti.com, arnd@arndb.de, lenb@kernel.org, nsekhar@ti.com Subject: [PATCH 4/9] ARM: OMAP4: cpuidle: fix wrong driver initialization Date: Fri, 29 Mar 2013 11:31:30 +0100 Message-Id: <1364553095-25110-4-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1364553095-25110-1-git-send-email-daniel.lezcano@linaro.org> References: <1364553095-25110-1-git-send-email-daniel.lezcano@linaro.org> X-Gm-Message-State: ALoCoQmBuEqPHkpBAiWfT8cRYf68j5u+HKhy8vIctVdsrJ2PKkLOGSG5dh4RSw4PhV5XtHRVJsUk Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The driver is initialized several times. This is wrong and if the return code of the function was checked, it will return -EINVAL. Move this initialization out of the loop. Signed-off-by: Daniel Lezcano --- arch/arm/mach-omap2/cpuidle44xx.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c index f4b1b23..3d33b8a 100644 --- a/arch/arm/mach-omap2/cpuidle44xx.c +++ b/arch/arm/mach-omap2/cpuidle44xx.c @@ -210,6 +210,7 @@ int __init omap4_idle_init(void) { struct cpuidle_device *dev; unsigned int cpu_id = 0; + int ret; mpu_pd = pwrdm_lookup("mpu_pwrdm"); cpu_pd[0] = pwrdm_lookup("cpu0_pwrdm"); @@ -222,14 +223,18 @@ int __init omap4_idle_init(void) if (!cpu_clkdm[0] || !cpu_clkdm[1]) return -ENODEV; + ret = cpuidle_register_driver(&omap4_idle_driver); + if (ret) { + printk(KERN_ERR "failed to register the idle driver\n"); + return ret; + } + for_each_cpu(cpu_id, cpu_online_mask) { dev = &per_cpu(omap4_idle_dev, cpu_id); dev->cpu = cpu_id; #ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED dev->coupled_cpus = *cpu_online_mask; #endif - cpuidle_register_driver(&omap4_idle_driver); - if (cpuidle_register_device(dev)) { pr_err("%s: CPUidle register failed\n", __func__); return -EIO;