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_link.c | |
parent | cfee47f99bc14a6d7c6b0be2284db2cef310a815 (diff) | |
parent | 50dd096973f1d95aa03c6a6d9e148d706b62b68e (diff) | |
download | blackbird-op-linux-cece901481bafbf14de8cbd3a89ae869ea881055.tar.gz blackbird-op-linux-cece901481bafbf14de8cbd3a89ae869ea881055.zip |
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_link.c')
-rw-r--r-- | drivers/acpi/pci_link.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index d53bd9878ca2..812d733fe816 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c @@ -103,7 +103,7 @@ DEFINE_MUTEX(acpi_link_lock); static acpi_status acpi_pci_link_check_possible(struct acpi_resource *resource, void *context) { - struct acpi_pci_link *link = (struct acpi_pci_link *)context; + struct acpi_pci_link *link = context; u32 i = 0; @@ -613,7 +613,7 @@ acpi_pci_link_allocate_irq(acpi_handle handle, return -1; } - link = (struct acpi_pci_link *)acpi_driver_data(device); + link = acpi_driver_data(device); if (!link) { printk(KERN_ERR PREFIX "Invalid link context\n"); return -1; @@ -668,7 +668,7 @@ int acpi_pci_link_free_irq(acpi_handle handle) return -1; } - link = (struct acpi_pci_link *)acpi_driver_data(device); + link = acpi_driver_data(device); if (!link) { printk(KERN_ERR PREFIX "Invalid link context\n"); return -1; @@ -808,7 +808,7 @@ static int acpi_pci_link_remove(struct acpi_device *device, int type) if (!device || !acpi_driver_data(device)) return -EINVAL; - link = (struct acpi_pci_link *)acpi_driver_data(device); + link = acpi_driver_data(device); mutex_lock(&acpi_link_lock); list_del(&link->node); |