PNPACPI trivial cleanup
Subsystems (2)
PATCH 1/1 PNPACPI trivial cleanup
Trivial cleanup (mostly white-space).
Signed-off-by Bjorn Helgaas <[email protected]>
drivers/pnp/pnpacpi/core.c.1 renamed from drivers/pnp/pnpacpi/core.c +10 -11
@@ -3,7 +3,7 @@ * * Copyright (c) 2004 Matthieu Castet <[email protected]> * Copyright (c) 2004 Li Shaohua <[email protected]> - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the * Free Software Foundation; either version 2, or (at your option) any
@@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - + #include <linux/acpi.h> #include <linux/pnp.h> #include <acpi/acpi_bus.h>
@@ -87,7 +87,7 @@ static int pnpacpi_get_resources(struct pnp_dev * dev, struct pnp_resource_table * res) { acpi_status status; - status = pnpacpi_parse_allocated_resource((acpi_handle)dev->data, + status = pnpacpi_parse_allocated_resource((acpi_handle)dev->data, &dev->res); return ACPI_FAILURE(status) ? -ENODEV : 0; }
@@ -119,7 +119,7 @@ acpi_status status; /* acpi_unregister_gsi(pnp_irq(dev, 0)); */ - status = acpi_evaluate_object((acpi_handle)dev->data, + status = acpi_evaluate_object((acpi_handle)dev->data, "_DIS", NULL, NULL); return ACPI_FAILURE(status) ? -ENODEV : 0; }
@@ -179,8 +179,7 @@ pnpidacpi_to_pnpid(acpi_device_hid(device), dev_id->id); pnp_add_id(dev_id, dev); - if(dev->active) { - /* parse allocated resource */ + if (dev->active) { status = pnpacpi_parse_allocated_resource(device->handle, &dev->res); if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) { pnp_err("PnPACPI: METHOD_NAME__CRS failure for %s", dev_id->id);
@@ -188,8 +187,8 @@ } } - if(dev->capabilities & PNP_CONFIGURABLE) { - status = pnpacpi_parse_resource_option_data(device->handle, + if (dev->capabilities & PNP_CONFIGURABLE) { + status = pnpacpi_parse_resource_option_data(device->handle, dev); if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) { pnp_err("PnPACPI: METHOD_NAME__PRS failure for %s", dev_id->id);
@@ -205,7 +204,7 @@ for (i = 0; i < cid_list->count; i++) { if (!ispnpidacpi(cid_list->id[i].value)) continue; - dev_id = pnpacpi_kmalloc(sizeof(struct pnp_id), + dev_id = pnpacpi_kmalloc(sizeof(struct pnp_id), GFP_KERNEL); if (!dev_id) continue;
@@ -219,7 +218,7 @@ if (!dev->active) pnp_init_resource_table(&dev->res); pnp_add_device(dev); - num ++; + num++; return AE_OK; err1:
@@ -244,7 +243,7 @@ int __init pnpacpi_init(void) { if (acpi_disabled) { - pnp_info("PnP ACPI: ACPI disable"); + pnp_info("PnP ACPI: ACPI disabled"); return 0; } pnp_info("PnP ACPI init");
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek. It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
Adam Belay
AppliedQuoted 2 lines · Bjorn Helgaas
Trivial cleanup (mostly white-space).
Applied.
Thanks,
Adam
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek. It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt