diff options
author | Greg Kroah-Hartman | 2018-07-16 09:04:54 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2018-07-16 09:04:54 +0200 |
commit | 83cf9cd6d50ed4f7e6ae265e80e38b235c792f5f (patch) | |
tree | 6016c386c321cd6a3e8575e01ed9f10834fc5081 /arch/microblaze/kernel/reset.c | |
parent | parport: ieee1284: mark expected switch fall-throughs (diff) | |
parent | Linux 4.18-rc5 (diff) | |
download | kernel-qcow2-linux-83cf9cd6d50ed4f7e6ae265e80e38b235c792f5f.tar.gz kernel-qcow2-linux-83cf9cd6d50ed4f7e6ae265e80e38b235c792f5f.tar.xz kernel-qcow2-linux-83cf9cd6d50ed4f7e6ae265e80e38b235c792f5f.zip |
Merge 4.18-rc5 into char-misc-next
We want the char-misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/microblaze/kernel/reset.c')
-rw-r--r-- | arch/microblaze/kernel/reset.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/microblaze/kernel/reset.c b/arch/microblaze/kernel/reset.c index bab4c8330ef4..fcbe1daf6316 100644 --- a/arch/microblaze/kernel/reset.c +++ b/arch/microblaze/kernel/reset.c @@ -18,7 +18,7 @@ static int handle; /* reset pin handle */ static unsigned int reset_val; -void of_platform_reset_gpio_probe(void) +static int of_platform_reset_gpio_probe(void) { int ret; handle = of_get_named_gpio(of_find_node_by_path("/"), @@ -27,13 +27,13 @@ void of_platform_reset_gpio_probe(void) if (!gpio_is_valid(handle)) { pr_info("Skipping unavailable RESET gpio %d (%s)\n", handle, "reset"); - return; + return -ENODEV; } ret = gpio_request(handle, "reset"); if (ret < 0) { pr_info("GPIO pin is already allocated\n"); - return; + return ret; } /* get current setup value */ @@ -51,11 +51,12 @@ void of_platform_reset_gpio_probe(void) pr_info("RESET: Registered gpio device: %d, current val: %d\n", handle, reset_val); - return; + return 0; err: gpio_free(handle); - return; + return ret; } +device_initcall(of_platform_reset_gpio_probe); static void gpio_system_reset(void) |