From patchwork Fri Feb 24 10:30:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 142807 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-fa0-f56.google.com (mail-fa0-f56.google.com [209.85.161.56]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 1802CB6FA1 for ; Fri, 24 Feb 2012 21:30:41 +1100 (EST) Received: by faaa26 with SMTP id a26sf1514642faa.11 for ; Fri, 24 Feb 2012 02:30:34 -0800 (PST) Received-SPF: pass (google.com: domain of rtc-linux+bncCI3O95KhAxDJzZ36BBoEpLvYRQ@googlegroups.com designates 10.180.97.41 as permitted sender) client-ip=10.180.97.41; Authentication-Results: mr.google.com; spf=pass (google.com: domain of rtc-linux+bncCI3O95KhAxDJzZ36BBoEpLvYRQ@googlegroups.com designates 10.180.97.41 as permitted sender) smtp.mail=rtc-linux+bncCI3O95KhAxDJzZ36BBoEpLvYRQ@googlegroups.com; dkim=pass header.i=rtc-linux+bncCI3O95KhAxDJzZ36BBoEpLvYRQ@googlegroups.com Received: from mr.google.com ([10.180.97.41]) by 10.180.97.41 with SMTP id dx9mr1480907wib.0.1330079434495 (num_hops = 1); Fri, 24 Feb 2012 02:30:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=mime-version:x-beenthere:received-spf:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references:x-sa-exim-connect-ip :x-sa-exim-mail-from:x-sa-exim-scanned:x-ptx-original-recipient :x-original-sender:x-original-authentication-results:reply-to :precedence:mailing-list:list-id:x-google-group-id:list-post :list-help:list-archive:sender:list-subscribe:list-unsubscribe :content-type; bh=F1c4uKVluGZ/VARkE/0ejHn8nShEvDOZKpl/ZZ/NStk=; b=3m2k4QSpgyDLm0M2WjXALL20/kQy4gIIjN2SSTpFYJRkn5FTjeJqf02qsyYUzFeIDL Gqh9oFKVvURVJZJTKZlG3TsXKxSkOba+Pd/521BhJovVzYx3lJ5fDA1Lx8/+A0cPtvEU lJqixFLPRFN06uwTV6bVom0dno+b66o+48lGg= Received: by 10.180.97.41 with SMTP id dx9mr397929wib.0.1330079433675; Fri, 24 Feb 2012 02:30:33 -0800 (PST) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.213.0.154 with SMTP id 26ls621854ebb.7.gmail; Fri, 24 Feb 2012 02:30:33 -0800 (PST) Received: by 10.14.126.146 with SMTP id b18mr721447eei.8.1330079433071; Fri, 24 Feb 2012 02:30:33 -0800 (PST) Received: by 10.14.126.146 with SMTP id b18mr721445eei.8.1330079433058; Fri, 24 Feb 2012 02:30:33 -0800 (PST) Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de. [92.198.50.35]) by gmr-mx.google.com with ESMTPS id n48si3285959eeh.1.2012.02.24.02.30.32 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 24 Feb 2012 02:30:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of w.sang@pengutronix.de designates 92.198.50.35 as permitted sender) client-ip=92.198.50.35; Received: from katana.hi.pengutronix.de ([2001:6f8:1178:2:221:70ff:fe71:1890] helo=pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1S0sQ4-0003SB-Cg; Fri, 24 Feb 2012 11:30:32 +0100 From: Wolfram Sang To: rtc-linux@googlegroups.com Cc: Alessandro Zummo , Andrew Morton , Austin Boyle , David Anders , Wolfram Sang Subject: [rtc-linux] [PATCH 2/4] rtc: ds1307: simplify irq setup code Date: Fri, 24 Feb 2012 11:30:13 +0100 Message-Id: <1330079415-28000-3-git-send-email-w.sang@pengutronix.de> X-Mailer: git-send-email 1.7.9 In-Reply-To: <1330079415-28000-1-git-send-email-w.sang@pengutronix.de> References: <1330079415-28000-1-git-send-email-w.sang@pengutronix.de> X-SA-Exim-Connect-IP: 2001:6f8:1178:2:221:70ff:fe71:1890 X-SA-Exim-Mail-From: w.sang@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: rtc-linux@googlegroups.com X-Original-Sender: w.sang@pengutronix.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of w.sang@pengutronix.de designates 92.198.50.35 as permitted sender) smtp.mail=w.sang@pengutronix.de Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: X-Google-Group-Id: 712029733259 List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , No need to have two seperate if-blocks for setting up the irq. Signed-off-by: Wolfram Sang Tested-by: David Anders --- drivers/rtc/rtc-ds1307.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c index a039ffc..d29d149 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c @@ -646,11 +646,6 @@ static int __devinit ds1307_probe(struct i2c_client *client, case ds_1337: case ds_1339: case ds_3231: - /* has IRQ? */ - if (ds1307->client->irq > 0 && chip->alarm) { - INIT_WORK(&ds1307->work, ds1307_work); - want_irq = true; - } /* get registers that the "rtc" read below won't read... */ tmp = ds1307->read_block_data(ds1307->client, DS1337_REG_CONTROL, 2, buf); @@ -668,10 +663,14 @@ static int __devinit ds1307_probe(struct i2c_client *client, * For some variants, be sure alarms can trigger when we're * running on Vbackup (BBSQI/BBSQW) */ - if (want_irq) { + if (ds1307->client->irq > 0 && chip->alarm) { + INIT_WORK(&ds1307->work, ds1307_work); + ds1307->regs[0] |= DS1337_BIT_INTCN | bbsqi_bitpos[ds1307->type]; ds1307->regs[0] &= ~(DS1337_BIT_A2IE | DS1337_BIT_A1IE); + + want_irq = true; } i2c_smbus_write_byte_data(client, DS1337_REG_CONTROL,