From patchwork Fri Apr 20 14:38:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: viresh kumar X-Patchwork-Id: 154048 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 C6517B7031 for ; Sat, 21 Apr 2012 00:39:00 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756767Ab2DTOjA (ORCPT ); Fri, 20 Apr 2012 10:39:00 -0400 Received: from mail-pz0-f52.google.com ([209.85.210.52]:40428 "EHLO mail-pz0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754768Ab2DTOi7 (ORCPT ); Fri, 20 Apr 2012 10:38:59 -0400 Received: by mail-pz0-f52.google.com with SMTP id e40so13106310dak.11 for ; Fri, 20 Apr 2012 07:38:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references; bh=a/UQmazZpnA+98BFPSqoUFZhQZID2B5tDPEDvJIjUjw=; b=gn5+O4Z4DWf2AtPupDuaDumMEJ/enYJQaV0ghREwYV5jwp/z1zWvKXIq07NvXHjf/N 5enzeqv96RrcZ82BNS8UPUF+kz0ltWqJNqpbj5oNgCQ4xICqxTvBdEvNtOYflQSpKB6l 9Alom8nOg2qhori5l9dUO3ly4L+RHCC9TfIModXDO+1jf3disdz70Kpf4pVL7+Vabvso IU+X+lJPUYgPoBky2UoKk32I0o+9dfxgyyOVWfL72wLjawaIgOAYSK+4VgQvlpo5H7Xh q/lVcRwj2gSFGagcx3/W82qkyV3XrRla/3PR+fIZlfLFU3DAPs3w38kq5zbSTWw4B2ja UfYg== Received: by 10.68.134.133 with SMTP id pk5mr13629492pbb.17.1334932739484; Fri, 20 Apr 2012 07:38:59 -0700 (PDT) Received: from localhost ([106.205.147.134]) by mx.google.com with ESMTPS id pt8sm5504776pbc.64.2012.04.20.07.38.49 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 20 Apr 2012 07:38:56 -0700 (PDT) From: Viresh Kumar To: jgarzik@redhat.com Cc: spear-devel@list.st.com, viresh.linux@gmail.com, linux-ide@vger.kernel.org, Viresh Kumar Subject: [PATCH 1/5] ata/pata_arasan_cf: Move arasan_cf_pm_ops out of #ifdef, #endif macros Date: Fri, 20 Apr 2012 20:08:19 +0530 Message-Id: X-Mailer: git-send-email 1.7.9 In-Reply-To: References: In-Reply-To: References: 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 }, };