Skip to content

Commit

Permalink
[IA64] arch/ia64/hp/common/sba_iommu.c: Rename dev_info to adi
Browse files Browse the repository at this point in the history
There is a macro called dev_info that prints struct device specific
information.  Having variables with the same name can be confusing and
prevents conversion of the macro to a function.

Rename the existing dev_info variables to something else in preparation
to converting the dev_info macro to a function.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
  • Loading branch information
Joe Perches authored and Tony Luck committed May 18, 2010
1 parent 82b22c8 commit 80aa9bf
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions arch/ia64/hp/common/sba_iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -2046,27 +2046,27 @@ acpi_sba_ioc_add(struct acpi_device *device)
struct ioc *ioc;
acpi_status status;
u64 hpa, length;
struct acpi_device_info *dev_info;
struct acpi_device_info *adi;

status = hp_acpi_csr_space(device->handle, &hpa, &length);
if (ACPI_FAILURE(status))
return 1;

status = acpi_get_object_info(device->handle, &dev_info);
status = acpi_get_object_info(device->handle, &adi);
if (ACPI_FAILURE(status))
return 1;

/*
* For HWP0001, only SBA appears in ACPI namespace. It encloses the PCI
* root bridges, and its CSR space includes the IOC function.
*/
if (strncmp("HWP0001", dev_info->hardware_id.string, 7) == 0) {
if (strncmp("HWP0001", adi->hardware_id.string, 7) == 0) {
hpa += ZX1_IOC_OFFSET;
/* zx1 based systems default to kernel page size iommu pages */
if (!iovp_shift)
iovp_shift = min(PAGE_SHIFT, 16);
}
kfree(dev_info);
kfree(adi);

/*
* default anything not caught above or specified on cmdline to 4k
Expand Down

0 comments on commit 80aa9bf

Please sign in to comment.