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@xxxxxxxxx>
AuthorDate: Sat, 21 Dec 2019 17:30:25
Committer: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
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@xxxxxxxxx>
Signed-off-by: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20191221173027.30716-3-tiny.windzz@xxxxxxxxx
---
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)
|