diff options
| author | Len Brown <len.brown@intel.com> | 2006-12-16 01:04:27 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-16 01:04:27 -0500 |
| commit | cece901481bafbf14de8cbd3a89ae869ea881055 (patch) | |
| tree | f9e240443643008c8feeaf55919105dc63ab8c72 /drivers/acpi/pci_root.c | |
| parent | cfee47f99bc14a6d7c6b0be2284db2cef310a815 (diff) | |
| parent | 50dd096973f1d95aa03c6a6d9e148d706b62b68e (diff) | |
Pull style into test branch
Conflicts:
drivers/acpi/button.c
drivers/acpi/ec.c
drivers/acpi/osl.c
drivers/acpi/sbs.c
Diffstat (limited to 'drivers/acpi/pci_root.c')
| -rw-r--r-- | drivers/acpi/pci_root.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 0984a1ee24e..03e03741c14 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -119,7 +119,7 @@ EXPORT_SYMBOL(acpi_pci_unregister_driver); static acpi_status get_root_bridge_busnr_callback(struct acpi_resource *resource, void *data) { - int *busnr = (int *)data; + int *busnr = data; struct acpi_resource_address64 address; if (resource->type != ACPI_RESOURCE_TYPE_ADDRESS16 && @@ -331,7 +331,7 @@ static int acpi_pci_root_remove(struct acpi_device *device, int type) if (!device || !acpi_driver_data(device)) return -EINVAL; - root = (struct acpi_pci_root *)acpi_driver_data(device); + root = acpi_driver_data(device); kfree(root); |