Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1464583

[tip:timers/urgent] clocksource/drivers/mips-gic-timer: Make gic_clocksource_of_init() return int

Show all headers | View raw

Commit-ID:  be5769e2061ac40b32daa83e28e1c4aac7133511
Gitweb:     http://git.kernel.org/tip/be5769e2061ac40b32daa83e28e1c4aac7133511
Author:     Paul Gortmaker <paul.gortmaker@windriver.com>
AuthorDate: Wed, 17 Aug 2016 12:21:35 +0200
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 17 Aug 2016 13:08:32 +0200

clocksource/drivers/mips-gic-timer: Make gic_clocksource_of_init() return int

In commit:

  d8152bf85d2c0 ("clocksource/drivers/mips-gic-timer: Convert init function to return error")

several return values were added to a void function resulting in the following warnings:

 clocksource/mips-gic-timer.c: In function 'gic_clocksource_of_init':
 clocksource/mips-gic-timer.c:175:3: warning: 'return' with a value, in function returning void [enabled by default]
 clocksource/mips-gic-timer.c:183:4: warning: 'return' with a value, in function returning void [enabled by default]
 clocksource/mips-gic-timer.c:190:3: warning: 'return' with a value, in function returning void [enabled by default]
 clocksource/mips-gic-timer.c:195:3: warning: 'return' with a value, in function returning void [enabled by default]
 clocksource/mips-gic-timer.c:200:3: warning: 'return' with a value, in function returning void [enabled by default]
 clocksource/mips-gic-timer.c:211:2: warning: 'return' with a value, in function returning void [enabled by default]
 clocksource/mips-gic-timer.c: At top level:
 clocksource/mips-gic-timer.c:213:1: warning: comparison of distinct pointer types lacks a cast [enabled by default]
 clocksource/mips-gic-timer.c: In function 'gic_clocksource_of_init':
 clocksource/mips-gic-timer.c:183:18: warning: ignoring return value of 'PTR_ERR', declared with attribute warn_unused_result [-Wunused-result]

Given that the addition of the return values was intentional, it seems
that the conversion of the containing function from void to int was
simply overlooked.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mips@linux-mips.org
Fixes: d8152bf85d2c ("clocksource/drivers/mips-gic-timer: Convert init function to return error")
Link: http://lkml.kernel.org/r/1471429296-9053-3-git-send-email-daniel.lezcano@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 drivers/clocksource/mips-gic-timer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c
index d91e872..b4b3ab5 100644
--- a/drivers/clocksource/mips-gic-timer.c
+++ b/drivers/clocksource/mips-gic-timer.c
@@ -164,7 +164,7 @@ void __init gic_clocksource_init(unsigned int frequency)
 	gic_start_count();
 }
 
-static void __init gic_clocksource_of_init(struct device_node *node)
+static int __init gic_clocksource_of_init(struct device_node *node)
 {
 	struct clk *clk;
 	int ret;

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PULL] : clockevents/clocksource fixes for 4.8 Daniel Lezcano <daniel.lezcano@linaro.org> - 2016-08-17 12:20 +0200
  [PATCH 2/3] clocksource/drivers/kona: Fix get_counter error handling Daniel Lezcano <daniel.lezcano@linaro.org> - 2016-08-17 12:30 +0200
    [tip:timers/urgent] clocksource/drivers/kona: Fix get_counter()  error handling tip-bot for Arnd Bergmann <tipbot@zytor.com> - 2016-08-17 15:40 +0200
  [PATCH 3/3] clocksource/drivers/mips-gic-timer: Make gic_clocksource_of_init return int Daniel Lezcano <daniel.lezcano@linaro.org> - 2016-08-17 12:30 +0200
    [tip:timers/urgent] clocksource/drivers/mips-gic-timer: Make  gic_clocksource_of_init() return int tip-bot for Paul Gortmaker <tipbot@zytor.com> - 2016-08-17 15:40 +0200
  [PATCH 1/3] clocksource/drivers/time-armada-370-xp: Fix the clock reference Daniel Lezcano <daniel.lezcano@linaro.org> - 2016-08-17 12:30 +0200
    [tip:timers/urgent] clocksource/drivers/time-armada-370-xp: Fix the  clock reference tip-bot for Gregory CLEMENT <tipbot@zytor.com> - 2016-08-17 15:40 +0200

csiph-web