aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuman Anna <s-anna@ti.com>2015-07-20 18:33:32 -0400
committerJoerg Roedel <jroedel@suse.de>2015-08-03 10:04:43 -0400
commit5835b6a64ce39434d5cc9857769c73982d488b42 (patch)
treec4866555c3ea9d1764272cbc796af36b9ad6a746
parenteb642a3f5afdb13aa2b7ba0bda314b0d2b62165d (diff)
iommu/omap: Align code with open parenthesis
Fix all the occurrences of the following check warning generated with the checkpatch --strict option: "CHECK: Alignment should match open parenthesis" Signed-off-by: Suman Anna <s-anna@ti.com> Signed-off-by: Joerg Roedel <jroedel@suse.de>
-rw-r--r--drivers/iommu/omap-iommu.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index 4328d9855edb..36d0033c2ccb 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -787,14 +787,14 @@ static irqreturn_t iommu_fault_handler(int irq, void *data)
787 787
788 if (!iopgd_is_table(*iopgd)) { 788 if (!iopgd_is_table(*iopgd)) {
789 dev_err(obj->dev, "%s: errs:0x%08x da:0x%08x pgd:0x%p *pgd:px%08x\n", 789 dev_err(obj->dev, "%s: errs:0x%08x da:0x%08x pgd:0x%p *pgd:px%08x\n",
790 obj->name, errs, da, iopgd, *iopgd); 790 obj->name, errs, da, iopgd, *iopgd);
791 return IRQ_NONE; 791 return IRQ_NONE;
792 } 792 }
793 793
794 iopte = iopte_offset(iopgd, da); 794 iopte = iopte_offset(iopgd, da);
795 795
796 dev_err(obj->dev, "%s: errs:0x%08x da:0x%08x pgd:0x%p *pgd:0x%08x pte:0x%p *pte:0x%08x\n", 796 dev_err(obj->dev, "%s: errs:0x%08x da:0x%08x pgd:0x%p *pgd:0x%08x pte:0x%p *pte:0x%08x\n",
797 obj->name, errs, da, iopgd, *iopgd, iopte, *iopte); 797 obj->name, errs, da, iopgd, *iopgd, iopte, *iopte);
798 798
799 return IRQ_NONE; 799 return IRQ_NONE;
800} 800}
@@ -820,9 +820,8 @@ static struct omap_iommu *omap_iommu_attach(const char *name, u32 *iopgd)
820 struct device *dev; 820 struct device *dev;
821 struct omap_iommu *obj; 821 struct omap_iommu *obj;
822 822
823 dev = driver_find_device(&omap_iommu_driver.driver, NULL, 823 dev = driver_find_device(&omap_iommu_driver.driver, NULL, (void *)name,
824 (void *)name, 824 device_match_by_alias);
825 device_match_by_alias);
826 if (!dev) 825 if (!dev)
827 return ERR_PTR(-ENODEV); 826 return ERR_PTR(-ENODEV);
828 827
@@ -977,7 +976,7 @@ static u32 iotlb_init_entry(struct iotlb_entry *e, u32 da, u32 pa, int pgsz)
977} 976}
978 977
979static int omap_iommu_map(struct iommu_domain *domain, unsigned long da, 978static int omap_iommu_map(struct iommu_domain *domain, unsigned long da,
980 phys_addr_t pa, size_t bytes, int prot) 979 phys_addr_t pa, size_t bytes, int prot)
981{ 980{
982 struct omap_iommu_domain *omap_domain = to_omap_domain(domain); 981 struct omap_iommu_domain *omap_domain = to_omap_domain(domain);
983 struct omap_iommu *oiommu = omap_domain->iommu_dev; 982 struct omap_iommu *oiommu = omap_domain->iommu_dev;
@@ -1004,7 +1003,7 @@ static int omap_iommu_map(struct iommu_domain *domain, unsigned long da,
1004} 1003}
1005 1004
1006static size_t omap_iommu_unmap(struct iommu_domain *domain, unsigned long da, 1005static size_t omap_iommu_unmap(struct iommu_domain *domain, unsigned long da,
1007 size_t size) 1006 size_t size)
1008{ 1007{
1009 struct omap_iommu_domain *omap_domain = to_omap_domain(domain); 1008 struct omap_iommu_domain *omap_domain = to_omap_domain(domain);
1010 struct omap_iommu *oiommu = omap_domain->iommu_dev; 1009 struct omap_iommu *oiommu = omap_domain->iommu_dev;
@@ -1055,7 +1054,7 @@ out:
1055} 1054}
1056 1055
1057static void _omap_iommu_detach_dev(struct omap_iommu_domain *omap_domain, 1056static void _omap_iommu_detach_dev(struct omap_iommu_domain *omap_domain,
1058 struct device *dev) 1057 struct device *dev)
1059{ 1058{
1060 struct omap_iommu *oiommu = dev_to_omap_iommu(dev); 1059 struct omap_iommu *oiommu = dev_to_omap_iommu(dev);
1061 struct omap_iommu_arch_data *arch_data = dev->archdata.iommu; 1060 struct omap_iommu_arch_data *arch_data = dev->archdata.iommu;
@@ -1076,7 +1075,7 @@ static void _omap_iommu_detach_dev(struct omap_iommu_domain *omap_domain,
1076} 1075}
1077 1076
1078static void omap_iommu_detach_dev(struct iommu_domain *domain, 1077static void omap_iommu_detach_dev(struct iommu_domain *domain,
1079 struct device *dev) 1078 struct device *dev)
1080{ 1079{
1081 struct omap_iommu_domain *omap_domain = to_omap_domain(domain); 1080 struct omap_iommu_domain *omap_domain = to_omap_domain(domain);
1082 1081
@@ -1137,7 +1136,7 @@ static void omap_iommu_domain_free(struct iommu_domain *domain)
1137} 1136}
1138 1137
1139static phys_addr_t omap_iommu_iova_to_phys(struct iommu_domain *domain, 1138static phys_addr_t omap_iommu_iova_to_phys(struct iommu_domain *domain,
1140 dma_addr_t da) 1139 dma_addr_t da)
1141{ 1140{
1142 struct omap_iommu_domain *omap_domain = to_omap_domain(domain); 1141 struct omap_iommu_domain *omap_domain = to_omap_domain(domain);
1143 struct omap_iommu *oiommu = omap_domain->iommu_dev; 1142 struct omap_iommu *oiommu = omap_domain->iommu_dev;
@@ -1154,7 +1153,7 @@ static phys_addr_t omap_iommu_iova_to_phys(struct iommu_domain *domain,
1154 ret = omap_iommu_translate(*pte, da, IOLARGE_MASK); 1153 ret = omap_iommu_translate(*pte, da, IOLARGE_MASK);
1155 else 1154 else
1156 dev_err(dev, "bogus pte 0x%x, da 0x%llx", *pte, 1155 dev_err(dev, "bogus pte 0x%x, da 0x%llx", *pte,
1157 (unsigned long long)da); 1156 (unsigned long long)da);
1158 } else { 1157 } else {
1159 if (iopgd_is_section(*pgd)) 1158 if (iopgd_is_section(*pgd))
1160 ret = omap_iommu_translate(*pgd, da, IOSECTION_MASK); 1159 ret = omap_iommu_translate(*pgd, da, IOSECTION_MASK);
@@ -1162,7 +1161,7 @@ static phys_addr_t omap_iommu_iova_to_phys(struct iommu_domain *domain,
1162 ret = omap_iommu_translate(*pgd, da, IOSUPER_MASK); 1161 ret = omap_iommu_translate(*pgd, da, IOSUPER_MASK);
1163 else 1162 else
1164 dev_err(dev, "bogus pgd 0x%x, da 0x%llx", *pgd, 1163 dev_err(dev, "bogus pgd 0x%x, da 0x%llx", *pgd,
1165 (unsigned long long)da); 1164 (unsigned long long)da);
1166 } 1165 }
1167 1166
1168 return ret; 1167 return ret;