Commit ce8f5e23 authored by Len Brown's avatar Len Brown Committed by Len Brown

[ACPI] fix return syntax

Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarJesper Juhl <juhl-lkml@dif.dk>
parent e40a6a14
...@@ -866,7 +866,7 @@ static int __init asus_hotk_add_fs(struct acpi_device *device) ...@@ -866,7 +866,7 @@ static int __init asus_hotk_add_fs(struct acpi_device *device)
acpi_device_dir(device) = asus_proc_dir; acpi_device_dir(device) = asus_proc_dir;
if (!acpi_device_dir(device)) if (!acpi_device_dir(device))
return(-ENODEV); return -ENODEV;
proc = create_proc_entry(PROC_INFO, mode, acpi_device_dir(device)); proc = create_proc_entry(PROC_INFO, mode, acpi_device_dir(device));
if (proc) { if (proc) {
...@@ -1098,16 +1098,16 @@ static int __init asus_hotk_check(void) ...@@ -1098,16 +1098,16 @@ static int __init asus_hotk_check(void)
result = acpi_bus_get_status(hotk->device); result = acpi_bus_get_status(hotk->device);
if (result) if (result)
return(result); return result;
if (hotk->device->status.present) { if (hotk->device->status.present) {
result = asus_hotk_get_info(); result = asus_hotk_get_info();
} else { } else {
printk(KERN_ERR " Hotkey device not present, aborting\n"); printk(KERN_ERR " Hotkey device not present, aborting\n");
return(-EINVAL); return -EINVAL;
} }
return(result); return result;
} }
...@@ -1117,7 +1117,7 @@ static int __init asus_hotk_add(struct acpi_device *device) ...@@ -1117,7 +1117,7 @@ static int __init asus_hotk_add(struct acpi_device *device)
int result; int result;
if (!device) if (!device)
return(-EINVAL); return -EINVAL;
printk(KERN_NOTICE "Asus Laptop ACPI Extras version %s\n", printk(KERN_NOTICE "Asus Laptop ACPI Extras version %s\n",
ASUS_ACPI_VERSION); ASUS_ACPI_VERSION);
...@@ -1125,7 +1125,7 @@ static int __init asus_hotk_add(struct acpi_device *device) ...@@ -1125,7 +1125,7 @@ static int __init asus_hotk_add(struct acpi_device *device)
hotk = hotk =
(struct asus_hotk *) kmalloc(sizeof(struct asus_hotk), GFP_KERNEL); (struct asus_hotk *) kmalloc(sizeof(struct asus_hotk), GFP_KERNEL);
if (!hotk) if (!hotk)
return(-ENOMEM); return -ENOMEM;
memset(hotk, 0, sizeof(struct asus_hotk)); memset(hotk, 0, sizeof(struct asus_hotk));
hotk->handle = device->handle; hotk->handle = device->handle;
...@@ -1173,7 +1173,7 @@ static int __init asus_hotk_add(struct acpi_device *device) ...@@ -1173,7 +1173,7 @@ static int __init asus_hotk_add(struct acpi_device *device)
kfree(hotk); kfree(hotk);
} }
return(result); return result;
} }
...@@ -1182,7 +1182,7 @@ static int asus_hotk_remove(struct acpi_device *device, int type) ...@@ -1182,7 +1182,7 @@ static int asus_hotk_remove(struct acpi_device *device, int type)
acpi_status status = 0; acpi_status status = 0;
if (!device || !acpi_driver_data(device)) if (!device || !acpi_driver_data(device))
return(-EINVAL); return -EINVAL;
status = acpi_remove_notify_handler(hotk->handle, ACPI_SYSTEM_NOTIFY, status = acpi_remove_notify_handler(hotk->handle, ACPI_SYSTEM_NOTIFY,
asus_hotk_notify); asus_hotk_notify);
...@@ -1193,7 +1193,7 @@ static int asus_hotk_remove(struct acpi_device *device, int type) ...@@ -1193,7 +1193,7 @@ static int asus_hotk_remove(struct acpi_device *device, int type)
kfree(hotk); kfree(hotk);
return(0); return 0;
} }
......
...@@ -356,7 +356,7 @@ acpi_os_get_timer (void) ...@@ -356,7 +356,7 @@ acpi_os_get_timer (void)
if (!t) if (!t)
printk(KERN_ERR PREFIX "acpi_os_get_timer() TBD\n"); printk(KERN_ERR PREFIX "acpi_os_get_timer() TBD\n");
return(++t); return ++t;
} }
acpi_status acpi_status
...@@ -635,7 +635,7 @@ acpi_os_write_pci_configuration ( ...@@ -635,7 +635,7 @@ acpi_os_write_pci_configuration (
acpi_integer value, acpi_integer value,
u32 width) u32 width)
{ {
return (AE_SUPPORT); return AE_SUPPORT;
} }
acpi_status acpi_status
...@@ -645,7 +645,7 @@ acpi_os_read_pci_configuration ( ...@@ -645,7 +645,7 @@ acpi_os_read_pci_configuration (
void *value, void *value,
u32 width) u32 width)
{ {
return (AE_SUPPORT); return AE_SUPPORT;
} }
void void
......
...@@ -820,7 +820,7 @@ void acpi_penalize_isa_irq(int irq) ...@@ -820,7 +820,7 @@ void acpi_penalize_isa_irq(int irq)
*/ */
static int __init acpi_irq_isa(char *str) static int __init acpi_irq_isa(char *str)
{ {
return(acpi_irq_penalty_update(str, 1)); return acpi_irq_penalty_update(str, 1);
} }
__setup("acpi_irq_isa=", acpi_irq_isa); __setup("acpi_irq_isa=", acpi_irq_isa);
...@@ -831,7 +831,7 @@ __setup("acpi_irq_isa=", acpi_irq_isa); ...@@ -831,7 +831,7 @@ __setup("acpi_irq_isa=", acpi_irq_isa);
*/ */
static int __init acpi_irq_pci(char *str) static int __init acpi_irq_pci(char *str)
{ {
return(acpi_irq_penalty_update(str, 0)); return acpi_irq_penalty_update(str, 0);
} }
__setup("acpi_irq_pci=", acpi_irq_pci); __setup("acpi_irq_pci=", acpi_irq_pci);
......
...@@ -508,7 +508,7 @@ add_device(void) ...@@ -508,7 +508,7 @@ add_device(void)
proc->write_proc = (write_proc_t*)dispatch_write; proc->write_proc = (write_proc_t*)dispatch_write;
} }
return(AE_OK); return AE_OK;
} }
static acpi_status __exit static acpi_status __exit
...@@ -518,7 +518,7 @@ remove_device(void) ...@@ -518,7 +518,7 @@ remove_device(void)
for (item = proc_items; item->name; ++item) for (item = proc_items; item->name; ++item)
remove_proc_entry(item->name, toshiba_proc_dir); remove_proc_entry(item->name, toshiba_proc_dir);
return(AE_OK); return AE_OK;
} }
static int __init static int __init
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment