The patch titled toshiba_acpi: make remove_device() and add_device() void has been added to the -mm tree. Its filename is toshiba_acpi-make-remove_device-and-add_device-void.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: toshiba_acpi: make remove_device() and add_device() void From: Axel Lin <axel.lin@xxxxxxxxx> 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@xxxxxxxxx> Cc: Matthew Garrett <mjg@xxxxxxxxxx> Cc: Márton Németh <nm127@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/platform/x86/toshiba_acpi.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff -puN drivers/platform/x86/toshiba_acpi.c~toshiba_acpi-make-remove_device-and-add_device-void drivers/platform/x86/toshiba_acpi.c --- a/drivers/platform/x86/toshiba_acpi.c~toshiba_acpi-make-remove_device-and-add_device-void +++ a/drivers/platform/x86/toshiba_acpi.c @@ -720,25 +720,22 @@ static const struct file_operations vers #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 = { @@ -921,7 +918,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; @@ -969,11 +965,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; _ Patches currently in -mm which might be from axel.lin@xxxxxxxxx are linux-next.patch hp-wmi-return-enodev-if-bios-does-not-export-any-supported-hp-wmi-guid.patch fujitsu-laptop-remove-unnecessary-input_free_device-calls.patch compal-laptop-fujitsu-laptop-msi-laptop-make-dmi_check_cb-to-return-1-instead-of-0.patch asus_acpi-fix-a-memory-leak-in-asus_hotk_get_info.patch asus_acpi-fix-coding-style-to-improve-readability.patch acerhdf-make-needlessly-global-symbols-static.patch classmate-laptop-make-needlessly-global-symbols-static.patch fujitsu-laptop-make-needlessly-global-symbols-static.patch msi-laptop-make-struct-rfkill_ops-const.patch asus-laptop-fix-incorrect-return-value-for-write_acpi_int_ret-if-handle-is-null.patch asus-laptop-return-proper-error-for-store_ledd-if-write_acpi_int-fail.patch acerhdf-fix-resource-reclaim-in-error-path.patch toshiba_acpi-make-remove_device-and-add_device-void.patch toshiba_acpi-rename-add_device-and-remove_device-to-create_toshiba_proc_entries-and-remove_toshiba_proc_entries.patch intel_menlow-fix-memory-leaks-in-error-path-fix.patch drivers-video-backlight-s6e63m0c-set-permissions-on-gamma_table-file-to-0444.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html