Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Input: atlas_btns - fix mixing acpi_status and int for return value

To improve readability, this patch fixes mixing acpi_status
and int for return value.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

authored by

Axel Lin and committed by
Dmitry Torokhov
02b5fac1 07d19ffc

+6 -8
+6 -8
drivers/input/misc/atlas_btns.c
··· 60 60 input_report_key(input_dev, atlas_keymap[code], key_down); 61 61 input_sync(input_dev); 62 62 63 - status = 0; 63 + status = AE_OK; 64 64 } else { 65 65 printk(KERN_WARNING "atlas: shrugged on unexpected function" 66 66 ":function=%x,address=%lx,value=%x\n", 67 67 function, (unsigned long)address, (u32)*value); 68 - status = -EINVAL; 68 + status = AE_BAD_PARAMETER; 69 69 } 70 70 71 71 return status; ··· 114 114 if (ACPI_FAILURE(status)) { 115 115 printk(KERN_ERR "Atlas: Error installing addr spc handler\n"); 116 116 input_unregister_device(input_dev); 117 - status = -EINVAL; 117 + err = -EINVAL; 118 118 } 119 119 120 - return status; 120 + return err; 121 121 } 122 122 123 123 static int atlas_acpi_button_remove(struct acpi_device *device, int type) ··· 126 126 127 127 status = acpi_remove_address_space_handler(device->handle, 128 128 0x81, &acpi_atlas_button_handler); 129 - if (ACPI_FAILURE(status)) { 129 + if (ACPI_FAILURE(status)) 130 130 printk(KERN_ERR "Atlas: Error removing addr spc handler\n"); 131 - status = -EINVAL; 132 - } 133 131 134 132 input_unregister_device(input_dev); 135 133 136 - return status; 134 + return 0; 137 135 } 138 136 139 137 static const struct acpi_device_id atlas_device_ids[] = {