summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2004-12-21 02:54:09 -0500
committerLen Brown <lenb@dhcppc3.>2004-12-21 02:54:09 -0500
commitce8f5e23e85dd7c052777cf19a90afa14541cd98 (patch)
treef3e6e34754306d60cd3687097bddba96f8e5b7de
parente40a6a141317824e94529c24e76f206dca77c915 (diff)
[ACPI] fix return syntax
Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
-rw-r--r--drivers/acpi/asus_acpi.c18
-rw-r--r--drivers/acpi/osl.c6
-rw-r--r--drivers/acpi/pci_link.c4
-rw-r--r--drivers/acpi/toshiba_acpi.c4
4 files changed, 16 insertions, 16 deletions
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index f2ca51befcbc..0078c8fb1b78 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -866,7 +866,7 @@ static int __init asus_hotk_add_fs(struct acpi_device *device)
acpi_device_dir(device) = asus_proc_dir;
if (!acpi_device_dir(device))
- return(-ENODEV);
+ return -ENODEV;
proc = create_proc_entry(PROC_INFO, mode, acpi_device_dir(device));
if (proc) {
@@ -1098,16 +1098,16 @@ static int __init asus_hotk_check(void)
result = acpi_bus_get_status(hotk->device);
if (result)
- return(result);
+ return result;
if (hotk->device->status.present) {
result = asus_hotk_get_info();
} else {
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)
int result;
if (!device)
- return(-EINVAL);
+ return -EINVAL;
printk(KERN_NOTICE "Asus Laptop ACPI Extras version %s\n",
ASUS_ACPI_VERSION);
@@ -1125,7 +1125,7 @@ static int __init asus_hotk_add(struct acpi_device *device)
hotk =
(struct asus_hotk *) kmalloc(sizeof(struct asus_hotk), GFP_KERNEL);
if (!hotk)
- return(-ENOMEM);
+ return -ENOMEM;
memset(hotk, 0, sizeof(struct asus_hotk));
hotk->handle = device->handle;
@@ -1173,7 +1173,7 @@ static int __init asus_hotk_add(struct acpi_device *device)
kfree(hotk);
}
- return(result);
+ return result;
}
@@ -1182,7 +1182,7 @@ static int asus_hotk_remove(struct acpi_device *device, int type)
acpi_status status = 0;
if (!device || !acpi_driver_data(device))
- return(-EINVAL);
+ return -EINVAL;
status = acpi_remove_notify_handler(hotk->handle, ACPI_SYSTEM_NOTIFY,
asus_hotk_notify);
@@ -1193,7 +1193,7 @@ static int asus_hotk_remove(struct acpi_device *device, int type)
kfree(hotk);
- return(0);
+ return 0;
}
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 5d8afd7ab2ca..f81b3b978983 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -356,7 +356,7 @@ acpi_os_get_timer (void)
if (!t)
printk(KERN_ERR PREFIX "acpi_os_get_timer() TBD\n");
- return(++t);
+ return ++t;
}
acpi_status
@@ -635,7 +635,7 @@ acpi_os_write_pci_configuration (
acpi_integer value,
u32 width)
{
- return (AE_SUPPORT);
+ return AE_SUPPORT;
}
acpi_status
@@ -645,7 +645,7 @@ acpi_os_read_pci_configuration (
void *value,
u32 width)
{
- return (AE_SUPPORT);
+ return AE_SUPPORT;
}
void
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 7f09ae162ded..3191b5ff105e 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -820,7 +820,7 @@ void acpi_penalize_isa_irq(int irq)
*/
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);
@@ -831,7 +831,7 @@ __setup("acpi_irq_isa=", acpi_irq_isa);
*/
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);
diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c
index a073256386e9..c0c9ea1084aa 100644
--- a/drivers/acpi/toshiba_acpi.c
+++ b/drivers/acpi/toshiba_acpi.c
@@ -508,7 +508,7 @@ add_device(void)
proc->write_proc = (write_proc_t*)dispatch_write;
}
- return(AE_OK);
+ return AE_OK;
}
static acpi_status __exit
@@ -518,7 +518,7 @@ remove_device(void)
for (item = proc_items; item->name; ++item)
remove_proc_entry(item->name, toshiba_proc_dir);
- return(AE_OK);
+ return AE_OK;
}
static int __init