On Tue, Jul 13, 2010 at 05:31:15PM +0800, Axel Lin wrote:
> To improve readability, this patch fixes mixing acpi_status
> and int for return value.
>
> Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
> ---
> drivers/input/misc/atlas_btns.c | 13 +++++++------
> 1 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/input/misc/atlas_btns.c b/drivers/input/misc/atlas_btns.c
> index 7d53608..ea14800 100644
> --- a/drivers/input/misc/atlas_btns.c
> +++ b/drivers/input/misc/atlas_btns.c
> @@ -60,12 +60,12 @@ static acpi_status acpi_atlas_button_handler(u32 function,
> input_report_key(input_dev, atlas_keymap[code], key_down);
> input_sync(input_dev);
>
> - status = 0;
> + status = AE_OK;
> } else {
> printk(KERN_WARNING "atlas: shrugged on unexpected function"
> ":function=%x,address=%lx,value=%x\n",
> function, (unsigned long)address, (u32)*value);
> - status = -EINVAL;
> + status = AE_BAD_PARAMETER;
> }
>
> return status;
> @@ -114,26 +114,27 @@ static int atlas_acpi_button_add(struct acpi_device *device)
> if (ACPI_FAILURE(status)) {
> printk(KERN_ERR "Atlas: Error installing addr spc handler\n");
> input_unregister_device(input_dev);
> - status = -EINVAL;
> + err = -EINVAL;
> }
>
> - return status;
> + return err;
> }
>
> static int atlas_acpi_button_remove(struct acpi_device *device, int type)
> {
> acpi_status status;
> + int err = 0;
>
> status = acpi_remove_address_space_handler(device->handle,
> 0x81, &acpi_atlas_button_handler);
> if (ACPI_FAILURE(status)) {
> printk(KERN_ERR "Atlas: Error removing addr spc handler\n");
> - status = -EINVAL;
> + err = -EINVAL;
> }
>
> input_unregister_device(input_dev);
>
> - return status;
> + return err;
We should not report any errors since operation is irreversible, just
log them. I believe typing remove methods as returning int instead of
void was a mistake.
I'll fix it up and apply both patches, thanks Axel.
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
