diff options
author | Jiang Liu <jiang.liu@linux.intel.com> | 2014-01-06 01:18:26 -0500 |
---|---|---|
committer | Joerg Roedel <joro@8bytes.org> | 2014-01-09 06:44:16 -0500 |
commit | b707cb027edf5b7ff1b8637c184b9a58d74e5159 (patch) | |
tree | 6262a1626449d392faa3d7c59aa54d9c81280a03 | |
parent | cc05301fd54f3e166aedf24e39f6731c4dec0451 (diff) |
iommu/vt-d, trivial: clean sparse warnings
Clean up most sparse warnings in Intel DMA and interrupt remapping
drivers.
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Joerg Roedel <joro@8bytes.org>
-rw-r--r-- | drivers/iommu/dmar.c | 6 | ||||
-rw-r--r-- | drivers/iommu/intel-iommu.c | 2 | ||||
-rw-r--r-- | drivers/iommu/irq_remapping.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index 753c7ecf66a8..158156543410 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c | |||
@@ -572,7 +572,7 @@ int __init detect_intel_iommu(void) | |||
572 | x86_init.iommu.iommu_init = intel_iommu_init; | 572 | x86_init.iommu.iommu_init = intel_iommu_init; |
573 | #endif | 573 | #endif |
574 | } | 574 | } |
575 | early_acpi_os_unmap_memory(dmar_tbl, dmar_tbl_size); | 575 | early_acpi_os_unmap_memory((void __iomem *)dmar_tbl, dmar_tbl_size); |
576 | dmar_tbl = NULL; | 576 | dmar_tbl = NULL; |
577 | 577 | ||
578 | return ret ? 1 : -ENODEV; | 578 | return ret ? 1 : -ENODEV; |
@@ -1064,7 +1064,7 @@ int dmar_enable_qi(struct intel_iommu *iommu) | |||
1064 | desc_page = alloc_pages_node(iommu->node, GFP_ATOMIC | __GFP_ZERO, 0); | 1064 | desc_page = alloc_pages_node(iommu->node, GFP_ATOMIC | __GFP_ZERO, 0); |
1065 | if (!desc_page) { | 1065 | if (!desc_page) { |
1066 | kfree(qi); | 1066 | kfree(qi); |
1067 | iommu->qi = 0; | 1067 | iommu->qi = NULL; |
1068 | return -ENOMEM; | 1068 | return -ENOMEM; |
1069 | } | 1069 | } |
1070 | 1070 | ||
@@ -1074,7 +1074,7 @@ int dmar_enable_qi(struct intel_iommu *iommu) | |||
1074 | if (!qi->desc_status) { | 1074 | if (!qi->desc_status) { |
1075 | free_page((unsigned long) qi->desc); | 1075 | free_page((unsigned long) qi->desc); |
1076 | kfree(qi); | 1076 | kfree(qi); |
1077 | iommu->qi = 0; | 1077 | iommu->qi = NULL; |
1078 | return -ENOMEM; | 1078 | return -ENOMEM; |
1079 | } | 1079 | } |
1080 | 1080 | ||
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index dec715c7e525..948c6a0d0f5a 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c | |||
@@ -382,7 +382,7 @@ struct device_domain_info { | |||
382 | 382 | ||
383 | static void flush_unmaps_timeout(unsigned long data); | 383 | static void flush_unmaps_timeout(unsigned long data); |
384 | 384 | ||
385 | DEFINE_TIMER(unmap_timer, flush_unmaps_timeout, 0, 0); | 385 | static DEFINE_TIMER(unmap_timer, flush_unmaps_timeout, 0, 0); |
386 | 386 | ||
387 | #define HIGH_WATER_MARK 250 | 387 | #define HIGH_WATER_MARK 250 |
388 | struct deferred_flush_tables { | 388 | struct deferred_flush_tables { |
diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c index 3b05d1b939c5..228632c99adb 100644 --- a/drivers/iommu/irq_remapping.c +++ b/drivers/iommu/irq_remapping.c | |||
@@ -295,8 +295,8 @@ int setup_ioapic_remapped_entry(int irq, | |||
295 | vector, attr); | 295 | vector, attr); |
296 | } | 296 | } |
297 | 297 | ||
298 | int set_remapped_irq_affinity(struct irq_data *data, const struct cpumask *mask, | 298 | static int set_remapped_irq_affinity(struct irq_data *data, |
299 | bool force) | 299 | const struct cpumask *mask, bool force) |
300 | { | 300 | { |
301 | if (!config_enabled(CONFIG_SMP) || !remap_ops || | 301 | if (!config_enabled(CONFIG_SMP) || !remap_ops || |
302 | !remap_ops->set_affinity) | 302 | !remap_ops->set_affinity) |