From patchwork Wed Jul 14 14:04:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Dietrich X-Patchwork-Id: 58904 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-wy0-f184.google.com (mail-wy0-f184.google.com [74.125.82.184]) by ozlabs.org (Postfix) with ESMTP id 84B69B6F04 for ; Thu, 15 Jul 2010 00:04:51 +1000 (EST) Received: by wyg36 with SMTP id 36sf2013659wyg.11 for ; Wed, 14 Jul 2010 07:04:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=domainkey-signature:received:x-beenthere:received:received:received :received:received-spf:received:received:date:from:to:cc:subject :message-id:references:mime-version:in-reply-to:user-agent :x-original-sender:x-original-authentication-results:reply-to :precedence:mailing-list:list-id:list-post:list-help:list-archive :sender:list-subscribe:list-unsubscribe:content-type :content-disposition; bh=FE9+3FyWLWV02xTaPgP5fwoOD1n18ul/PVtUx1tMC3g=; b=e49G6/6LeVp+O6rLxRqQPU1jcFbYIJ51WLjJKNd6rkrO0eNq7CSP556+7oI3b06039 Nj1YnOj/jR6JeumFzOGDh74MM2fQEHvij8XmnyEU0VKlP9CyRxKgmIRDh6A5bq/epe+e jIC5VUEgB+U05ON3xOyD+RqPTk7vdIE0gJf0M= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlegroups.com; s=beta; h=x-beenthere:received-spf:date:from:to:cc:subject:message-id :references:mime-version:in-reply-to:user-agent:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:list-post:list-help:list-archive:sender:list-subscribe :list-unsubscribe:content-type:content-disposition; b=MdGNUZASnjTaFGex92qtNJ+M2jYdddH7NFaXMWy2g/ZTr+tESXNKOZs3XDqtZXRGoA soLTkK5l2fWrxBuCBd0pSX2wwL8QtHj4557COaw5lTh8RYxUae4Rl+2TTWRSbxVhjpei jfKubUMggWA0ov4vsQ1nW80NQtFJJvnneav3Y= Received: by 10.216.145.132 with SMTP id p4mr1486397wej.5.1279116287345; Wed, 14 Jul 2010 07:04:47 -0700 (PDT) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.204.131.200 with SMTP id y8ls2028859bks.2.p; Wed, 14 Jul 2010 07:04:45 -0700 (PDT) Received: by 10.204.127.65 with SMTP id f1mr743759bks.5.1279116285327; Wed, 14 Jul 2010 07:04:45 -0700 (PDT) Received: by 10.204.127.65 with SMTP id f1mr743758bks.5.1279116285306; Wed, 14 Jul 2010 07:04:45 -0700 (PDT) Received: from faui40.informatik.uni-erlangen.de (faui40.informatik.uni-erlangen.de [131.188.34.40]) by gmr-mx.google.com with ESMTP id z25si4710348bku.1.2010.07.14.07.04.45; Wed, 14 Jul 2010 07:04:45 -0700 (PDT) Received-SPF: pass (google.com: domain of qy03fugy@stud.informatik.uni-erlangen.de designates 131.188.34.40 as permitted sender) client-ip=131.188.34.40; Received: from faui49q (faui49q.informatik.uni-erlangen.de [131.188.42.68]) by faui40.informatik.uni-erlangen.de (Postfix) with SMTP id 89B485F0D0; Wed, 14 Jul 2010 16:04:43 +0200 (MEST) Received: by faui49q (sSMTP sendmail emulation); Wed, 14 Jul 2010 16:04:43 +0200 Date: Wed, 14 Jul 2010 16:04:43 +0200 From: Christian Dietrich To: Alessandro Zummo , Paul Gortmaker , Andrew Morton , Ralf Baechle , Chris Wright , Arnaud Patard , rtc-linux@googlegroups.com, linux-kernel@vger.kernel.org Cc: vamos-dev@i4.informatik.uni-erlangen.de Subject: [rtc-linux] [PATCH 3/5] drivers/rtc: Remove unneeded ifdef CONFIG_PM Message-ID: <1768dbd136598aa52607378cdc7ba7b7870ab263.1279116162.git.qy03fugy@stud.informatik.uni-erlangen.de> References: MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) X-Original-Sender: qy03fugy@stud.informatik.uni-erlangen.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of qy03fugy@stud.informatik.uni-erlangen.de designates 131.188.34.40 as permitted sender) smtp.mail=qy03fugy@stud.informatik.uni-erlangen.de Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , Content-Disposition: inline Because CONFIG_PM is a precondition to CONFIG_ACPI, the ifdef CONFIG_PM within ifdef CONFIG_ACPI is redundant. Signed-off-by: Christian Dietrich Acked-by: Wan ZongShun --- drivers/rtc/rtc-cmos.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index 11b8ea2..5856167 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c @@ -970,7 +970,6 @@ static inline int cmos_poweroff(struct device *dev) #include -#ifdef CONFIG_PM static u32 rtc_handler(void *context) { acpi_clear_event(ACPI_EVENT_RTC); @@ -999,11 +998,6 @@ static void rtc_wake_off(struct device *dev) { acpi_disable_event(ACPI_EVENT_RTC, 0); } -#else -#define rtc_wake_setup() do{}while(0) -#define rtc_wake_on NULL -#define rtc_wake_off NULL -#endif /* Every ACPI platform has a mc146818 compatible "cmos rtc". Here we find * its device node and pass extra config data. This helps its driver use