From: Andrew Morton <akpm@linux-foundation.org>

- Those inlines don't do anything, and if they later do do something, it'll
  be the wrong thing.

- coding style fixes

Cc: "David S. Miller" <davem@davemloft.net>
Cc: "Keshavamurthy, Anil S" <anil.s.keshavamurthy@intel.com>
Cc: "Siddha, Suresh B" <suresh.b.siddha@intel.com>
Cc: Andi Kleen <ak@suse.de>
Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Ashok Raj <ashok.raj@intel.com>
Cc: Christoph Lameter <clameter@sgi.com>
Cc: Greg KH <greg@kroah.com>
Cc: Muli Ben-Yehuda <muli@il.ibm.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/pci/iova.c |   14 +++++++-------
 drivers/pci/iova.h |    6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff -puN drivers/pci/iova.c~intel-iommu-iova-allocation-and-management-routines-fix drivers/pci/iova.c
--- a/drivers/pci/iova.c~intel-iommu-iova-allocation-and-management-routines-fix
+++ a/drivers/pci/iova.c
@@ -33,7 +33,7 @@ __get_cached_rbnode(struct iova_domain *
 	}
 }
 
-static inline void
+static void
 __cached_rbnode_insert_update(struct iova_domain *iovad,
 	unsigned long limit_pfn, struct iova *new)
 {
@@ -42,7 +42,7 @@ __cached_rbnode_insert_update(struct iov
 	iovad->cached32_node = &new->node;
 }
 
-static inline void
+static void
 __cached_rbnode_delete_update(struct iova_domain *iovad, struct iova *free)
 {
 	struct iova *cached_iova;
@@ -57,7 +57,7 @@ __cached_rbnode_delete_update(struct iov
 		iovad->cached32_node = rb_next(&free->node);
 }
 
-static inline int __alloc_iova_range(struct iova_domain *iovad,
+static int __alloc_iova_range(struct iova_domain *iovad,
 	unsigned long size, unsigned long limit_pfn, struct iova *new)
 {
 	struct rb_node *curr = NULL;
@@ -243,18 +243,18 @@ void put_iova_domain(struct iova_domain 
 	spin_unlock_irqrestore(&iovad->iova_rbtree_lock, flags);
 }
 
-static inline int
+static int
 __is_range_overlap(struct rb_node *node,
 	unsigned long pfn_lo, unsigned long pfn_hi)
 {
-	struct iova * iova = container_of(node, struct iova, node);
+	struct iova *iova = container_of(node, struct iova, node);
 
 	if ((pfn_lo <= iova->pfn_hi) && (pfn_hi >= iova->pfn_lo))
 		return 1;
 	return 0;
 }
 
-static inline struct iova *
+static struct iova *
 __insert_new_range(struct iova_domain *iovad,
 	unsigned long pfn_lo, unsigned long pfn_hi)
 {
@@ -270,7 +270,7 @@ __insert_new_range(struct iova_domain *i
 	return iova;
 }
 
-static inline void
+static void
 __adjust_overlap_range(struct iova *iova,
 	unsigned long *pfn_lo, unsigned long *pfn_hi)
 {
diff -puN drivers/pci/iova.h~intel-iommu-iova-allocation-and-management-routines-fix drivers/pci/iova.h
--- a/drivers/pci/iova.h~intel-iommu-iova-allocation-and-management-routines-fix
+++ a/drivers/pci/iova.h
@@ -50,13 +50,13 @@ struct iova *alloc_iova_mem(void);
 void free_iova_mem(struct iova *iova);
 void free_iova(struct iova_domain *iovad, unsigned long pfn);
 void __free_iova(struct iova_domain *iovad, struct iova *iova);
-struct iova * alloc_iova(struct iova_domain *iovad, unsigned long size,
+struct iova *alloc_iova(struct iova_domain *iovad, unsigned long size,
 	unsigned long limit_pfn);
-struct iova * reserve_iova(struct iova_domain *iovad, unsigned long pfn_lo,
+struct iova *reserve_iova(struct iova_domain *iovad, unsigned long pfn_lo,
 	unsigned long pfn_hi);
 void copy_reserved_iova(struct iova_domain *from, struct iova_domain *to);
 void init_iova_domain(struct iova_domain *iovad);
-struct iova * find_iova(struct iova_domain *iovad, unsigned long pfn);
+struct iova *find_iova(struct iova_domain *iovad, unsigned long pfn);
 void put_iova_domain(struct iova_domain *iovad);
 
 #endif
_