From: "tip-bot2 for Yangtao Li" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Yangtao Li <tiny.windzz@gmail.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>, x86 <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [tip: timers/core] clocksource/drivers/em_sti: Fix variable declaration in em_sti_probe
Date: Thu, 16 Jan 2020 21:31:00 -0000 [thread overview]
Message-ID: <157921026100.396.4090300466956214113.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20191221173027.30716-3-tiny.windzz@gmail.com>
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 <tiny.windzz@gmail.com>
AuthorDate: Sat, 21 Dec 2019 17:30:25
Committer: Daniel Lezcano <daniel.lezcano@linaro.org>
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 <tiny.windzz@gmail.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
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)
next prev parent reply other threads:[~2020-01-16 21:31 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-21 17:30 [PATCH v2 0/4] clocksource: do some cleanup Yangtao Li
2019-12-21 17:30 ` [PATCH v2 1/4] clocksource: em_sti: convert to devm_platform_ioremap_resource Yangtao Li
2020-01-16 21:31 ` [tip: timers/core] clocksource/drivers/em_sti: Convert " tip-bot2 for Yangtao Li
2019-12-21 17:30 ` [PATCH v2 2/4] clocksource: em_sti: fix variable declaration in em_sti_probe Yangtao Li
2020-01-16 21:31 ` tip-bot2 for Yangtao Li [this message]
2019-12-21 17:30 ` [PATCH v2 3/4] clocksource: timer-ti-dm: convert to devm_platform_ioremap_resource Yangtao Li
2020-01-16 21:31 ` [tip: timers/core] clocksource/drivers/timer-ti-dm: Convert " tip-bot2 for Yangtao Li
2019-12-21 17:30 ` [PATCH v2 4/4] clocksource: timer-ti-dm: switch to platform_get_irq Yangtao Li
2020-01-16 21:31 ` [tip: timers/core] clocksource/drivers/timer-ti-dm: Switch " tip-bot2 for Yangtao Li
2019-12-21 18:29 ` [PATCH v2 0/4] clocksource: do some cleanup Daniel Lezcano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=157921026100.396.4090300466956214113.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=tiny.windzz@gmail.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®