From patchwork Mon Mar 25 17:55:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 2332741 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 399EA3FC54 for ; Mon, 25 Mar 2013 17:56:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758819Ab3CYR4L (ORCPT ); Mon, 25 Mar 2013 13:56:11 -0400 Received: from mail-wg0-f42.google.com ([74.125.82.42]:39596 "EHLO mail-wg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758320Ab3CYR4L (ORCPT ); Mon, 25 Mar 2013 13:56:11 -0400 Received: by mail-wg0-f42.google.com with SMTP id 12so4246319wgh.3 for ; Mon, 25 Mar 2013 10:56:09 -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=0L/h3g8PZGczzXdCocTpR8h9BKHLLBAkdthzAyupzR4=; b=i6+ZkjRxssc020AbFmVqO4ejtyV4IJ4PdhZ4yK1JuH6AzNG0Yh68PhzLpTjA3yiiIA ZlTlLKldnZnjHWXNJ1vKOFKYP8tmcduu88+gxP8MQFmhnvCEVudd7HbFBT8Z2gwZjc2H 0troArJtMqdxoZP551qw6zei4cj7WIhbuL5Xk1R1HEDepZarKjfDcdRup0ekBr7+yy5q pnXJWX49IvaAMPOyyaRHW7NgagDFckD/xdpjTfteJ5inFe9z/BdeyRGRompFR21ordZS bqFqociecW3I+BqrvnenrnBpr635T1wbOet176NYpilnIVAQezUxjOogl0T0jM+WNcnl o0eg== X-Received: by 10.181.12.5 with SMTP id em5mr19034437wid.24.1364234169627; Mon, 25 Mar 2013 10:56:09 -0700 (PDT) Received: from mai.home (AToulouse-654-1-426-131.w2-6.abo.wanadoo.fr. [2.6.209.131]) by mx.google.com with ESMTPS id s2sm23927749wib.4.2013.03.25.10.56.07 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 25 Mar 2013 10:56:09 -0700 (PDT) From: Daniel Lezcano To: rjw@sisk.pl, tglx@linutronix.de Cc: patches@linaro.org, linaro-kernel@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, linux@maxim.org.za, nicolas.ferre@atmel.com, plagnioj@jcrosoft.com, lenb@kernel.org, nsekhar@ti.com, kevin.hilman@linaro.org, horms@verge.net.au, magnus.damm@gmail.com, kernel@pengutronix.de, ben-linux@fluff.org, kgene.kim@samsung.com, rob.herring@calxeda.com, jason@lakedaemon.net, andrew@lunn.ch, linus.walleij@linaro.org, linux@arm.linux.org.uk Subject: [PATCH 11/15] ARM: s3c64xx: cpuidle: use init/exit common routine Date: Mon, 25 Mar 2013 18:55:36 +0100 Message-Id: <1364234140-514-12-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1364234140-514-1-git-send-email-daniel.lezcano@linaro.org> References: <1364234140-514-1-git-send-email-daniel.lezcano@linaro.org> X-Gm-Message-State: ALoCoQmqtMGJDV2K9XCd4PQaZNWHcnDwSH5MBlTM7XX6hQfzF4Sebfq2vbfWbqekSf/5/wSkdvUS Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Remove the duplicate code and use the arm cpuidle driver's common code for initialization. Signed-off-by: Daniel Lezcano --- arch/arm/mach-s3c64xx/cpuidle.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-s3c64xx/cpuidle.c b/arch/arm/mach-s3c64xx/cpuidle.c index ead5fab..ce56142 100644 --- a/arch/arm/mach-s3c64xx/cpuidle.c +++ b/arch/arm/mach-s3c64xx/cpuidle.c @@ -16,6 +16,7 @@ #include #include +#include #include #include @@ -40,8 +41,6 @@ static int s3c64xx_enter_idle(struct cpuidle_device *dev, return index; } -static DEFINE_PER_CPU(struct cpuidle_device, s3c64xx_cpuidle_device); - static struct cpuidle_driver s3c64xx_cpuidle_driver = { .name = "s3c64xx_cpuidle", .owner = THIS_MODULE, @@ -61,16 +60,6 @@ static struct cpuidle_driver s3c64xx_cpuidle_driver = { static int __init s3c64xx_init_cpuidle(void) { - int ret; - - cpuidle_register_driver(&s3c64xx_cpuidle_driver); - - ret = cpuidle_register_device(&s3c64xx_cpuidle_device); - if (ret) { - pr_err("Failed to register cpuidle device: %d\n", ret); - return ret; - } - - return 0; + return arm_cpuidle_init(&s3c64xx_cpuidle_driver); } device_initcall(s3c64xx_init_cpuidle);