From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 722EAC33CAF for ; Thu, 16 Jan 2020 21:31:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5038321582 for ; Thu, 16 Jan 2020 21:31:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388983AbgAPVbH (ORCPT ); Thu, 16 Jan 2020 16:31:07 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:53525 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388657AbgAPVbE (ORCPT ); Thu, 16 Jan 2020 16:31:04 -0500 Received: from [5.158.153.53] (helo=tip-bot2.lab.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1isCjF-0001XL-Jt; Thu, 16 Jan 2020 22:31:01 +0100 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id 3A7DB1C1970; Thu, 16 Jan 2020 22:31:01 +0100 (CET) Date: Thu, 16 Jan 2020 21:31:00 -0000 From: "tip-bot2 for Yangtao Li" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/core] clocksource/drivers/em_sti: Fix variable declaration in em_sti_probe Cc: Yangtao Li , Daniel Lezcano , x86 , LKML In-Reply-To: <20191221173027.30716-3-tiny.windzz@gmail.com> References: <20191221173027.30716-3-tiny.windzz@gmail.com> MIME-Version: 1.0 Message-ID: <157921026100.396.4090300466956214113.tip-bot2@tip-bot2> X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the timers/core branch of tip: Commit-ID: ba25322edd600300e55cd58eb7fbdf9cbdc5a82d Gitweb: https://git.kernel.org/tip/ba25322edd600300e55cd58eb7fbdf9cbdc5a82d Author: Yangtao Li AuthorDate: Sat, 21 Dec 2019 17:30:25 Committer: Daniel Lezcano CommitterDate: Thu, 16 Jan 2020 19:06:57 +01:00 clocksource/drivers/em_sti: Fix variable declaration in em_sti_probe 'irq' and 'ret' are variables of the same type and there is no need to use two lines. Signed-off-by: Yangtao Li Signed-off-by: Daniel Lezcano Link: https://lore.kernel.org/r/20191221173027.30716-3-tiny.windzz@gmail.com --- drivers/clocksource/em_sti.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/clocksource/em_sti.c b/drivers/clocksource/em_sti.c index 086fd5d..ab190df 100644 --- a/drivers/clocksource/em_sti.c +++ b/drivers/clocksource/em_sti.c @@ -279,8 +279,7 @@ static void em_sti_register_clockevent(struct em_sti_priv *p) static int em_sti_probe(struct platform_device *pdev) { struct em_sti_priv *p; - int irq; - int ret; + int irq, ret; p = devm_kzalloc(&pdev->dev, sizeof(*p), GFP_KERNEL); if (p == NULL)