toshiba_acpi: make remove_device() and add_device() void

remove_device() and add_device() are not related to ACPI APIs, it does not
make sense to return acpi_status for both functions.

Current implementation of add_device() always AE_OK, thus the return value
checking for add_device() always return false for ACPI_FAILURE(status).
This patch makes add_device() to be void and remove the unnecessary return
value checking.

remove_proc_entry() won't fail, thus change remove_device() to be void.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Márton Németh <nm127@freemail.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Matthew Garrett <mjg@redhat.com>

diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index a5e1aa3d8c72556a6c446ed9b24c56e3aa011d5b..c8bb7eb71c69cc9578fd9f469237b2a1b1640a41 100644 (file)
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -722,25 +722,22 @@ static const struct file_operations version_proc_fops = {
 
 #define PROC_TOSHIBA           "toshiba"
 
-static acpi_status __init add_device(void)
+static void __init add_device(void)
 {
        proc_create("lcd", S_IRUGO | S_IWUSR, toshiba_proc_dir, &lcd_proc_fops);
        proc_create("video", S_IRUGO | S_IWUSR, toshiba_proc_dir, &video_proc_fops);
        proc_create("fan", S_IRUGO | S_IWUSR, toshiba_proc_dir, &fan_proc_fops);
        proc_create("keys", S_IRUGO | S_IWUSR, toshiba_proc_dir, &keys_proc_fops);
        proc_create("version", S_IRUGO, toshiba_proc_dir, &version_proc_fops);
-
-       return AE_OK;
 }
 
-static acpi_status remove_device(void)
+static void remove_device(void)
 {
        remove_proc_entry("lcd", toshiba_proc_dir);
        remove_proc_entry("video", toshiba_proc_dir);
        remove_proc_entry("fan", toshiba_proc_dir);
        remove_proc_entry("keys", toshiba_proc_dir);
        remove_proc_entry("version", toshiba_proc_dir);
-       return AE_OK;
 }
 
 static struct backlight_ops toshiba_backlight_data = {
@@ -923,7 +920,6 @@ static void toshiba_acpi_exit(void)
 
 static int __init toshiba_acpi_init(void)
 {
-       acpi_status status = AE_OK;
        u32 hci_result;
        bool bt_present;
        int ret = 0;
@@ -971,11 +967,7 @@ static int __init toshiba_acpi_init(void)
                toshiba_acpi_exit();
                return -ENODEV;
        } else {
-               status = add_device();
-               if (ACPI_FAILURE(status)) {
-                       toshiba_acpi_exit();
-                       return -ENODEV;
-               }
+               add_device();
        }
 
        props.max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1;