From patchwork Wed Mar 5 17:12:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Shiyan X-Patchwork-Id: 327087 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-we0-x23e.google.com (mail-we0-x23e.google.com [IPv6:2a00:1450:400c:c03::23e]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 8437D2C009A for ; Thu, 6 Mar 2014 04:12:50 +1100 (EST) Received: by mail-we0-f190.google.com with SMTP id u56sf84940wes.7 for ; Wed, 05 Mar 2014 09:12:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=mime-version:from:to:cc:subject:date:message-id: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; bh=r4oiNQu3O49BE4gsoLtXNNwGjnCZMXKxx2ZbeqmXm+c=; b=cY97y3M2YGq1g0qRqmo2+XLkxhxhgyGu6L8cPhamVRUfPK43fEeYFmmE6Kj7miSsGD HBnwvcD1kvyyruiKP+P/VxIC3JVTsC9dHTthW3ztMgvfqQnDWQS7TlLo7jVnlReozR1j N9PbuKbrccpwrjYPyBskfiIq3UqXDrnKz8QePqrq2CqlPJWosiZPwXjM8jft+mrjsHwT 6WYtknPj43zIGrS/uUcgzVB1cPshNUFes2riDZ44wQpKKnibkSL0EIPclChAuFpIomFl bJQUdUBlmUMdWSV/sjVTLomxNAH+BG890TD3Q8rNPRW5WbKWFYoIHtYdBE2RPyDSP1fR ZwZw== X-Received: by 10.152.42.129 with SMTP id o1mr46033lal.30.1394039563864; Wed, 05 Mar 2014 09:12:43 -0800 (PST) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.152.120.72 with SMTP id la8ls409565lab.31.gmail; Wed, 05 Mar 2014 09:12:43 -0800 (PST) X-Received: by 10.112.173.105 with SMTP id bj9mr4364253lbc.4.1394039563000; Wed, 05 Mar 2014 09:12:43 -0800 (PST) Received: from smtp33.i.mail.ru (smtp33.i.mail.ru. [94.100.177.93]) by gmr-mx.google.com with ESMTPS id rg9si823922bkb.1.2014.03.05.09.12.42 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 05 Mar 2014 09:12:42 -0800 (PST) Received-SPF: pass (google.com: domain of shc_work@mail.ru designates 94.100.177.93 as permitted sender) client-ip=94.100.177.93; Received: from [188.134.40.128] (port=59297 helo=shc.zet) by smtp33.i.mail.ru with esmtpa (envelope-from ) id 1WLFN3-0001qM-Sr; Wed, 05 Mar 2014 21:12:42 +0400 From: Alexander Shiyan To: rtc-linux@googlegroups.com Cc: Alessandro Zummo , Alexander Shiyan Subject: [rtc-linux] [PATCH] rtc: treewide: Remove excess rtc_device validation Date: Wed, 5 Mar 2014 21:12:34 +0400 Message-Id: <1394039554-23501-1-git-send-email-shc_work@mail.ru> X-Mailer: git-send-email 1.8.3.2 X-Spam: Not detected X-Mras: Ok X-Original-Sender: shc_work@mail.ru X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of shc_work@mail.ru designates 94.100.177.93 as permitted sender) smtp.mail=shc_work@mail.ru; dkim=pass header.i=@mail.ru; dmarc=pass (p=NONE dis=NONE) header.from=mail.ru 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: , Commit 9ec5d20993 (rtc: verify a critical argument to rtc_update_irq() before using it) introduces validation for rtc_device in the RTC core, so there are no need to check this argument for rtc_update_irq() from the drivers. This patch removes such check for the existing rtc_update_irq() users. Signed-off-by: Alexander Shiyan --- drivers/rtc/rtc-ds1511.c | 3 +-- drivers/rtc/rtc-ds1553.c | 3 +-- drivers/rtc/rtc-stk17ta8.c | 3 +-- drivers/rtc/rtc-tx4939.c | 4 ++-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c index bc7b4fc..7126ed1 100644 --- a/drivers/rtc/rtc-ds1511.c +++ b/drivers/rtc/rtc-ds1511.c @@ -371,8 +371,7 @@ ds1511_interrupt(int irq, void *dev_id) events |= RTC_UF; else events |= RTC_AF; - if (likely(pdata->rtc)) - rtc_update_irq(pdata->rtc, 1, events); + rtc_update_irq(pdata->rtc, 1, events); } spin_unlock(&pdata->lock); return events ? IRQ_HANDLED : IRQ_NONE; diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c index fd31571..1a5d2d7 100644 --- a/drivers/rtc/rtc-ds1553.c +++ b/drivers/rtc/rtc-ds1553.c @@ -206,8 +206,7 @@ static irqreturn_t ds1553_rtc_interrupt(int irq, void *dev_id) events |= RTC_UF; else events |= RTC_AF; - if (likely(pdata->rtc)) - rtc_update_irq(pdata->rtc, 1, events); + rtc_update_irq(pdata->rtc, 1, events); } spin_unlock(&pdata->lock); return events ? IRQ_HANDLED : IRQ_NONE; diff --git a/drivers/rtc/rtc-stk17ta8.c b/drivers/rtc/rtc-stk17ta8.c index a176ba6..35ed49e 100644 --- a/drivers/rtc/rtc-stk17ta8.c +++ b/drivers/rtc/rtc-stk17ta8.c @@ -214,8 +214,7 @@ static irqreturn_t stk17ta8_rtc_interrupt(int irq, void *dev_id) events |= RTC_UF; else events |= RTC_AF; - if (likely(pdata->rtc)) - rtc_update_irq(pdata->rtc, 1, events); + rtc_update_irq(pdata->rtc, 1, events); } spin_unlock(&pdata->lock); return events ? IRQ_HANDLED : IRQ_NONE; diff --git a/drivers/rtc/rtc-tx4939.c b/drivers/rtc/rtc-tx4939.c index 4f87234..2e678c6 100644 --- a/drivers/rtc/rtc-tx4939.c +++ b/drivers/rtc/rtc-tx4939.c @@ -176,8 +176,8 @@ static irqreturn_t tx4939_rtc_interrupt(int irq, void *dev_id) tx4939_rtc_cmd(rtcreg, TX4939_RTCCTL_COMMAND_NOP); } spin_unlock(&pdata->lock); - if (likely(pdata->rtc)) - rtc_update_irq(pdata->rtc, 1, events); + rtc_update_irq(pdata->rtc, 1, events); + return IRQ_HANDLED; }