From patchwork Thu Mar 1 08:04:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh KUMAR X-Patchwork-Id: 143947 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id EC270B6F62 for ; Thu, 1 Mar 2012 19:14:58 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757428Ab2CAIO5 (ORCPT ); Thu, 1 Mar 2012 03:14:57 -0500 Received: from eu1sys200aog118.obsmtp.com ([207.126.144.145]:40193 "EHLO eu1sys200aog118.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757581Ab2CAIO5 (ORCPT ); Thu, 1 Mar 2012 03:14:57 -0500 Received: from beta.dmz-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob118.postini.com ([207.126.147.11]) with SMTP ID DSNKT08v+uxLZqpkXzb2OrqES4gxNfnGKmi2@postini.com; Thu, 01 Mar 2012 08:14:56 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id EDA6D161; Thu, 1 Mar 2012 08:06:21 +0000 (GMT) Received: from Webmail-ap.st.com (eapex1hubcas1.st.com [10.80.176.8]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id A3ECC15C9; Thu, 1 Mar 2012 08:14:46 +0000 (GMT) Received: from localhost (10.199.82.50) by Webmail-ap.st.com (10.80.176.7) with Microsoft SMTP Server (TLS) id 8.3.192.1; Thu, 1 Mar 2012 16:14:26 +0800 From: Viresh Kumar To: Cc: , , , Viresh Kumar Subject: [PATCH] ata/pata_arasan_cf: Move arasan_cf_pm_ops out of #ifdef, #endif macros Date: Thu, 1 Mar 2012 13:34:39 +0530 Message-ID: <427196876874fef7e956b10d035d06eed5895743.1330588911.git.viresh.kumar@st.com> X-Mailer: git-send-email 1.7.8.110.g4cb5d MIME-Version: 1.0 Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org #ifdef, #endif is not required in definition/usage of arasan_cf_pm_ops. So, move this definition and its usage outside of them. Signed-off-by: Viresh Kumar --- drivers/ata/pata_arasan_cf.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c index fc2db2a..3239517 100644 --- a/drivers/ata/pata_arasan_cf.c +++ b/drivers/ata/pata_arasan_cf.c @@ -943,9 +943,9 @@ static int arasan_cf_resume(struct device *dev) return 0; } +#endif static SIMPLE_DEV_PM_OPS(arasan_cf_pm_ops, arasan_cf_suspend, arasan_cf_resume); -#endif static struct platform_driver arasan_cf_driver = { .probe = arasan_cf_probe, @@ -953,9 +953,7 @@ static struct platform_driver arasan_cf_driver = { .driver = { .name = DRIVER_NAME, .owner = THIS_MODULE, -#ifdef CONFIG_PM .pm = &arasan_cf_pm_ops, -#endif }, };