Commit c513b67e authored Aug 06, 2010 by Linus Torvalds

pci: fix type warnings in intr_remapping.c

Commit 69309a05 ("x86, asm: Clean up and simplify set_64bit()")
sanitized the x86-64 types to set_64bit(), and incidentally resulted in
warnings like

drivers/pci/intr_remapping.c: In function 'modify_irte':
drivers/pci/intr_remapping.c:314: warning: passing argument 1 of 'set_64bit' from incompatible pointer type
arch/x86/include/asm/cmpxchg_64.h:6: note:expected 'volatile u64 *' but argument is of type 'long unsigned int *'

It turns out that the change to set_64bit() really does clean up things,
and the PCI intr_remapping.c file did a rather ugly cast in order to
avoid warnings with the previous set_64bit() type model.

Removing the ugly cast fixes the warning, and makes everybody happy and
expects a set_64bit() to take the logical "u64 *" argument.

Pointed-out-by: Peter Anvin <hpa@zytor.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 90c8327c

drivers/pci/intr_remapping.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -311,8 +311,8 @@ int modify_irte(int irq, struct irte *irte_modified)
		index = irq_iommu->irte_index + irq_iommu->sub_handle;
		irte = &iommu->ir_table->base[index];

		set_64bit((unsigned long *)&irte->low, irte_modified->low);
		set_64bit((unsigned long *)&irte->high, irte_modified->high);
		set_64bit(&irte->low, irte_modified->low);
		set_64bit(&irte->high, irte_modified->high);
		__iommu_flush_cache(iommu, irte, sizeof(*irte));

		rc = qi_flush_iec(iommu, index, 0);
		@@ -393,8 +393,8 @@ static int clear_entries(struct irq_2_iommu *irq_iommu)
		end = start + (1 << irq_iommu->irte_mask);

		for (entry = start; entry < end; entry++) {
		set_64bit((unsigned long *)&entry->low, 0);
		set_64bit((unsigned long *)&entry->high, 0);
		set_64bit(&entry->low, 0);
		set_64bit(&entry->high, 0);
		}

		return qi_flush_iec(iommu, index, irq_iommu->irte_mask);