summaryrefslogtreecommitdiffstats
path: root/arch/ia64/hp/common
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-04-05 12:05:31 -0700
committerTony Luck <tony.luck@intel.com>2010-05-18 14:45:53 -0700
commit80aa9bf0d8083554967400d48dbec078aa8f128e (patch)
treedd95bdf8804165ca1a798e44b5fd7c841a56139e /arch/ia64/hp/common
parent82b22c887e02fc6ebeebc8ec43fb1d348e2a6a58 (diff)
downloadop-kernel-dev-80aa9bf0d8083554967400d48dbec078aa8f128e.zip
op-kernel-dev-80aa9bf0d8083554967400d48dbec078aa8f128e.tar.gz
[IA64] arch/ia64/hp/common/sba_iommu.c: Rename dev_info to adi
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>
Diffstat (limited to 'arch/ia64/hp/common')
-rw-r--r--arch/ia64/hp/common/sba_iommu.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index e14c492..4ce8d13 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -2046,13 +2046,13 @@ 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;
@@ -2060,13 +2060,13 @@ acpi_sba_ioc_add(struct acpi_device *device)
* 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
OpenPOWER on IntegriCloud