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

Groups > linux.kernel > #1464481

[PATCH 3/3] clocksource/drivers/mips-gic-timer: Make gic_clocksource_of_init return int

Show all headers | View raw

From: Paul Gortmaker <paul.gortmaker@windriver.com>

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

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

 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.

Fixes: d8152bf85d2c ("clocksource/drivers/mips-gic-timer: Convert init function to return error")
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: linux-mips@linux-mips.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.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 1572c7a..2577a2f 100644
--- a/drivers/clocksource/mips-gic-timer.c
+++ b/drivers/clocksource/mips-gic-timer.c
@@ -176,7 +176,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;
-- 
1.9.1

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