diff options
author | Suman Anna <s-anna@ti.com> | 2013-05-30 19:10:59 -0400 |
---|---|---|
committer | Joerg Roedel <joro@8bytes.org> | 2013-06-20 10:53:26 -0400 |
commit | b6c2e09f74a1f95aa77b478b40b41538a2ccb8f0 (patch) | |
tree | a334d605181f9c577c28bf359cf1901db8d258af | |
parent | 2abfcfbcf02972f939196dce0ddf8dd470f23907 (diff) |
iommu/omap: fix checkpatch warnings in omap iommu code
This patch fixes the checkpatch warnings in omap iommu
code, most of them are related to broken strings.
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Joerg Roedel <joro@8bytes.org>
-rw-r--r-- | drivers/iommu/omap-iommu.c | 9 | ||||
-rw-r--r-- | drivers/iommu/omap-iopgtable.h | 2 | ||||
-rw-r--r-- | drivers/iommu/omap-iovmm.c | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c index 0cc658c21c93..0ba3766240d5 100644 --- a/drivers/iommu/omap-iommu.c +++ b/drivers/iommu/omap-iommu.c | |||
@@ -833,16 +833,15 @@ static irqreturn_t iommu_fault_handler(int irq, void *data) | |||
833 | iopgd = iopgd_offset(obj, da); | 833 | iopgd = iopgd_offset(obj, da); |
834 | 834 | ||
835 | if (!iopgd_is_table(*iopgd)) { | 835 | if (!iopgd_is_table(*iopgd)) { |
836 | dev_err(obj->dev, "%s: errs:0x%08x da:0x%08x pgd:0x%p " | 836 | dev_err(obj->dev, "%s: errs:0x%08x da:0x%08x pgd:0x%p *pgd:px%08x\n", |
837 | "*pgd:px%08x\n", obj->name, errs, da, iopgd, *iopgd); | 837 | obj->name, errs, da, iopgd, *iopgd); |
838 | return IRQ_NONE; | 838 | return IRQ_NONE; |
839 | } | 839 | } |
840 | 840 | ||
841 | iopte = iopte_offset(iopgd, da); | 841 | iopte = iopte_offset(iopgd, da); |
842 | 842 | ||
843 | dev_err(obj->dev, "%s: errs:0x%08x da:0x%08x pgd:0x%p *pgd:0x%08x " | 843 | dev_err(obj->dev, "%s: errs:0x%08x da:0x%08x pgd:0x%p *pgd:0x%08x pte:0x%p *pte:0x%08x\n", |
844 | "pte:0x%p *pte:0x%08x\n", obj->name, errs, da, iopgd, *iopgd, | 844 | obj->name, errs, da, iopgd, *iopgd, iopte, *iopte); |
845 | iopte, *iopte); | ||
846 | 845 | ||
847 | return IRQ_NONE; | 846 | return IRQ_NONE; |
848 | } | 847 | } |
diff --git a/drivers/iommu/omap-iopgtable.h b/drivers/iommu/omap-iopgtable.h index cd4ae9e5b0c6..f4003d568a92 100644 --- a/drivers/iommu/omap-iopgtable.h +++ b/drivers/iommu/omap-iopgtable.h | |||
@@ -95,4 +95,4 @@ static inline phys_addr_t omap_iommu_translate(u32 d, u32 va, u32 mask) | |||
95 | #define iopte_offset(iopgd, da) (iopgd_page_vaddr(iopgd) + iopte_index(da)) | 95 | #define iopte_offset(iopgd, da) (iopgd_page_vaddr(iopgd) + iopte_index(da)) |
96 | 96 | ||
97 | #define to_iommu(dev) \ | 97 | #define to_iommu(dev) \ |
98 | (struct omap_iommu *)platform_get_drvdata(to_platform_device(dev)) | 98 | ((struct omap_iommu *)platform_get_drvdata(to_platform_device(dev))) |
diff --git a/drivers/iommu/omap-iovmm.c b/drivers/iommu/omap-iovmm.c index 46d875690739..d14725984153 100644 --- a/drivers/iommu/omap-iovmm.c +++ b/drivers/iommu/omap-iovmm.c | |||
@@ -102,8 +102,8 @@ static size_t sgtable_len(const struct sg_table *sgt) | |||
102 | } | 102 | } |
103 | 103 | ||
104 | if (i && sg->offset) { | 104 | if (i && sg->offset) { |
105 | pr_err("%s: sg[%d] offset not allowed in internal " | 105 | pr_err("%s: sg[%d] offset not allowed in internal entries\n", |
106 | "entries\n", __func__, i); | 106 | __func__, i); |
107 | return 0; | 107 | return 0; |
108 | } | 108 | } |
109 | 109 | ||