iommu/fsl: Various cleanups

Currently a PAMU driver patch is very likely to receive some
checkpatch complaints about the code in the context of the
patch. This patch is an attempt to fix most of that and make
the driver more readable

Also fixed a subset of the sparse and coccinelle reported
issues.

Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

4 files changed, 179 insertions, 216 deletions

diff --git a/arch/powerpc/include/asm/fsl_pamu_stash.h b/arch/powerpc/include/asm/fsl_pamu_stash.h
index caa1b21c25cd..38311c98eed9 100644
--- a/arch/powerpc/include/asm/fsl_pamu_stash.h
+++ b/arch/powerpc/include/asm/fsl_pamu_stash.h
@@ -32,8 +32,8 @@ enum pamu_stash_target {
  */
 
 struct pamu_stash_attribute {
-        u32     cpu;    /* cpu number */
-        u32     cache;  /* cache to stash to: L1,L2,L3 */
+        u32     cpu;    /* cpu number */
+        u32     cache;  /* cache to stash to: L1,L2,L3 */
 };
 
 #endif  /* __FSL_PAMU_STASH_H */
diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c
index 6ee947e41870..abeedc9a78c2 100644
--- a/drivers/iommu/fsl_pamu.c
+++ b/drivers/iommu/fsl_pamu.c
@@ -18,22 +18,13 @@
 
 #define pr_fmt(fmt)    "fsl-pamu: %s: " fmt, __func__
 
-#include <linux/init.h>
-#include <linux/iommu.h>
-#include <linux/slab.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/mm.h>
+#include "fsl_pamu.h"
+
 #include <linux/interrupt.h>
-#include <linux/device.h>
-#include <linux/of_platform.h>
-#include <linux/bootmem.h>
 #include <linux/genalloc.h>
-#include <asm/io.h>
-#include <asm/bitops.h>
-#include <asm/fsl_guts.h>
 
-#include "fsl_pamu.h"
+#include <asm/mpc85xx.h>
+#include <asm/fsl_guts.h>
 
 /* define indexes for each operation mapping scenario */
 #define OMI_QMAN        0x00
@@ -44,13 +35,13 @@
 #define make64(high, low) (((u64)(high) << 32) | (low))
 
 struct pamu_isr_data {
-        void __iomem *pamu_reg_base;    /* Base address of PAMU regs*/
+        void __iomem *pamu_reg_base;    /* Base address of PAMU regs */
         unsigned int count;             /* The number of PAMUs */
 };
 
 static struct paace *ppaact;
 static struct paace *spaact;
-static struct ome *omt;
+static struct ome *omt __initdata;
 
 /*
  * Table for matching compatible strings, for device tree
@@ -58,14 +49,13 @@ static struct ome *omt;
  * "fsl,qoriq-device-config-2.0" corresponds to T4 & B4
  * SOCs. For the older SOCs "fsl,qoriq-device-config-1.0"
  * string would be used.
-*/
-static const struct of_device_id guts_device_ids[] = {
+ */
+static const struct of_device_id guts_device_ids[] __initconst = {
         { .compatible = "fsl,qoriq-device-config-1.0", },
         { .compatible = "fsl,qoriq-device-config-2.0", },
         {}
 };
 
-
 /*
  * Table for matching compatible strings, for device tree
  * L3 cache controller node.
@@ -73,7 +63,7 @@ static const struct of_device_id guts_device_ids[] = {
  * "fsl,b4860-l3-cache-controller" corresponds to B4 &
  * "fsl,p4080-l3-cache-controller" corresponds to other,
  * SOCs.
-*/
+ */
 static const struct of_device_id l3_device_ids[] = {
         { .compatible = "fsl,t4240-l3-cache-controller", },
         { .compatible = "fsl,b4860-l3-cache-controller", },
@@ -85,7 +75,7 @@ static const struct of_device_id l3_device_ids[] = {
 static u32 max_subwindow_count;
 
 /* Pool for fspi allocation */
-struct gen_pool *spaace_pool;
+static struct gen_pool *spaace_pool;
 
 /**
  * pamu_get_max_subwin_cnt() - Return the maximum supported
@@ -170,7 +160,7 @@ int pamu_disable_liodn(int liodn)
 static unsigned int map_addrspace_size_to_wse(phys_addr_t addrspace_size)
 {
         /* Bug if not a power of 2 */
-        BUG_ON((addrspace_size & (addrspace_size - 1)));
+        BUG_ON(addrspace_size & (addrspace_size - 1));
 
         /* window size is 2^(WSE+1) bytes */
         return fls64(addrspace_size) - 2;
@@ -179,8 +169,8 @@ static unsigned int map_addrspace_size_to_wse(phys_addr_t addrspace_size)
 /* Derive the PAACE window count encoding for the subwindow count */
 static unsigned int map_subwindow_cnt_to_wce(u32 subwindow_cnt)
 {
-       /* window count is 2^(WCE+1) bytes */
-       return __ffs(subwindow_cnt) - 1;
+        /* window count is 2^(WCE+1) bytes */
+        return __ffs(subwindow_cnt) - 1;
 }
 
 /*
@@ -241,7 +231,7 @@ static struct paace *pamu_get_spaace(struct paace *paace, u32 wnum)
  * If no SPAACE entry is available or the allocator can not reserve the required
  * number of contiguous entries function returns ULONG_MAX indicating a failure.
  *
-*/
+ */
 static unsigned long pamu_get_fspi_and_allocate(u32 subwin_cnt)
 {
         unsigned long spaace_addr;
@@ -288,9 +278,8 @@ int  pamu_update_paace_stash(int liodn, u32 subwin, u32 value)
         }
         if (subwin) {
                 paace = pamu_get_spaace(paace, subwin - 1);
-                if (!paace) {
+                if (!paace)
                         return -ENOENT;
-                }
         }
         set_bf(paace->impl_attr, PAACE_IA_CID, value);
 
@@ -311,14 +300,12 @@ int pamu_disable_spaace(int liodn, u32 subwin)
         }
         if (subwin) {
                 paace = pamu_get_spaace(paace, subwin - 1);
-                if (!paace) {
+                if (!paace)
                         return -ENOENT;
-                }
-                set_bf(paace->addr_bitfields, PAACE_AF_V,
-                         PAACE_V_INVALID);
+                set_bf(paace->addr_bitfields, PAACE_AF_V, PAACE_V_INVALID);
         } else {
                 set_bf(paace->addr_bitfields, PAACE_AF_AP,
-                         PAACE_AP_PERMS_DENIED);
+                       PAACE_AP_PERMS_DENIED);
         }
 
         mb();
@@ -326,7 +313,6 @@ int pamu_disable_spaace(int liodn, u32 subwin)
         return 0;
 }
 
-
 /**
  * pamu_config_paace() - Sets up PPAACE entry for specified liodn
  *
@@ -352,7 +338,8 @@ int pamu_config_ppaace(int liodn, phys_addr_t win_addr, phys_addr_t win_size,
         unsigned long fspi;
 
         if ((win_size & (win_size - 1)) || win_size < PAMU_PAGE_SIZE) {
-                pr_debug("window size too small or not a power of two %pa\n", &win_size);
+                pr_debug("window size too small or not a power of two %pa\n",
+                         &win_size);
                 return -EINVAL;
         }
 
@@ -362,13 +349,12 @@ int pamu_config_ppaace(int liodn, phys_addr_t win_addr, phys_addr_t win_size,
         }
 
         ppaace = pamu_get_ppaace(liodn);
-        if (!ppaace) {
+        if (!ppaace)
                 return -ENOENT;
-        }
 
         /* window size is 2^(WSE+1) bytes */
         set_bf(ppaace->addr_bitfields, PPAACE_AF_WSE,
-                map_addrspace_size_to_wse(win_size));
+               map_addrspace_size_to_wse(win_size));
 
         pamu_init_ppaace(ppaace);
 
@@ -442,7 +428,6 @@ int pamu_config_spaace(int liodn, u32 subwin_cnt, u32 subwin,
 {
         struct paace *paace;
 
-
         /* setup sub-windows */
         if (!subwin_cnt) {
                 pr_debug("Invalid subwindow count\n");
@@ -510,11 +495,11 @@ int pamu_config_spaace(int liodn, u32 subwin_cnt, u32 subwin,
 }
 
 /**
-* get_ome_index() - Returns the index in the operation mapping table
-*                   for device.
-* @*omi_index: pointer for storing the index value
-*
-*/
+ * get_ome_index() - Returns the index in the operation mapping table
+ *                   for device.
+ * @*omi_index: pointer for storing the index value
+ *
+ */
 void get_ome_index(u32 *omi_index, struct device *dev)
 {
         if (of_device_is_compatible(dev->of_node, "fsl,qman-portal"))
@@ -544,9 +529,10 @@ u32 get_stash_id(u32 stash_dest_hint, u32 vcpu)
         if (stash_dest_hint == PAMU_ATTR_CACHE_L3) {
                 node = of_find_matching_node(NULL, l3_device_ids);
                 if (node) {
-                        prop = of_get_property(node, "cache-stash-id", 0);
+                        prop = of_get_property(node, "cache-stash-id", NULL);
                         if (!prop) {
-                                pr_debug("missing cache-stash-id at %s\n", node->full_name);
+                                pr_debug("missing cache-stash-id at %s\n",
+                                         node->full_name);
                                 of_node_put(node);
                                 return ~(u32)0;
                         }
@@ -570,9 +556,10 @@ found_cpu_node:
         /* find the hwnode that represents the cache */
         for (cache_level = PAMU_ATTR_CACHE_L1; (cache_level < PAMU_ATTR_CACHE_L3) && found; cache_level++) {
                 if (stash_dest_hint == cache_level) {
-                        prop = of_get_property(node, "cache-stash-id", 0);
+                        prop = of_get_property(node, "cache-stash-id", NULL);
                         if (!prop) {
-                                pr_debug("missing cache-stash-id at %s\n", node->full_name);
+                                pr_debug("missing cache-stash-id at %s\n",
+                                         node->full_name);
                                 of_node_put(node);
                                 return ~(u32)0;
                         }
@@ -580,10 +567,10 @@ found_cpu_node:
                         return be32_to_cpup(prop);
                 }
 
-                prop = of_get_property(node, "next-level-cache", 0);
+                prop = of_get_property(node, "next-level-cache", NULL);
                 if (!prop) {
                         pr_debug("can't find next-level-cache at %s\n",
-                                node->full_name);
+                                 node->full_name);
                         of_node_put(node);
                         return ~(u32)0;  /* can't traverse any further */
                 }
@@ -598,7 +585,7 @@ found_cpu_node:
         }
 
         pr_debug("stash dest not found for %d on vcpu %d\n",
-                  stash_dest_hint, vcpu);
+                 stash_dest_hint, vcpu);
         return ~(u32)0;
 }
 
@@ -612,7 +599,7 @@ found_cpu_node:
  * Memory accesses to QMAN and BMAN private memory need not be coherent, so
  * clear the PAACE entry coherency attribute for them.
  */
-static void setup_qbman_paace(struct paace *ppaace, int  paace_type)
+static void __init setup_qbman_paace(struct paace *ppaace, int  paace_type)
 {
         switch (paace_type) {
         case QMAN_PAACE:
@@ -626,7 +613,7 @@ static void setup_qbman_paace(struct paace *ppaace, int  paace_type)
         case QMAN_PORTAL_PAACE:
                 set_bf(ppaace->impl_attr, PAACE_IA_OTM, PAACE_OTM_INDEXED);
                 ppaace->op_encode.index_ot.omi = OMI_QMAN;
-                /*Set DQRR and Frame stashing for the L3 cache */
+                /* Set DQRR and Frame stashing for the L3 cache */
                 set_bf(ppaace->impl_attr, PAACE_IA_CID, get_stash_id(PAMU_ATTR_CACHE_L3, 0));
                 break;
         case BMAN_PAACE:
@@ -679,7 +666,7 @@ static void __init setup_omt(struct ome *omt)
  * Get the maximum number of PAACT table entries
  * and subwindows supported by PAMU
  */
-static void get_pamu_cap_values(unsigned long pamu_reg_base)
+static void __init get_pamu_cap_values(unsigned long pamu_reg_base)
 {
         u32 pc_val;
 
@@ -689,9 +676,9 @@ static void get_pamu_cap_values(unsigned long pamu_reg_base)
 }
 
 /* Setup PAMU registers pointing to PAACT, SPAACT and OMT */
-int setup_one_pamu(unsigned long pamu_reg_base, unsigned long pamu_reg_size,
-                   phys_addr_t ppaact_phys, phys_addr_t spaact_phys,
-                   phys_addr_t omt_phys)
+static int __init setup_one_pamu(unsigned long pamu_reg_base, unsigned long pamu_reg_size,
+                                 phys_addr_t ppaact_phys, phys_addr_t spaact_phys,
+                                 phys_addr_t omt_phys)
 {
         u32 *pc;
         struct pamu_mmap_regs *pamu_regs;
@@ -727,7 +714,7 @@ int setup_one_pamu(unsigned long pamu_reg_base, unsigned long pamu_reg_size,
          */
 
         out_be32((u32 *)(pamu_reg_base + PAMU_PICS),
-                        PAMU_ACCESS_VIOLATION_ENABLE);
+                 PAMU_ACCESS_VIOLATION_ENABLE);
         out_be32(pc, PAMU_PC_PE | PAMU_PC_OCE | PAMU_PC_SPCC | PAMU_PC_PPCC);
         return 0;
 }
@@ -757,9 +744,9 @@ static void __init setup_liodns(void)
                         ppaace->wbah = 0;
                         set_bf(ppaace->addr_bitfields, PPAACE_AF_WBAL, 0);
                         set_bf(ppaace->impl_attr, PAACE_IA_ATM,
-                                PAACE_ATM_NO_XLATE);
+                               PAACE_ATM_NO_XLATE);
                         set_bf(ppaace->addr_bitfields, PAACE_AF_AP,
-                                PAACE_AP_PERMS_ALL);
+                               PAACE_AP_PERMS_ALL);
                         if (of_device_is_compatible(node, "fsl,qman-portal"))
                                 setup_qbman_paace(ppaace, QMAN_PORTAL_PAACE);
                         if (of_device_is_compatible(node, "fsl,qman"))
@@ -772,7 +759,7 @@ static void __init setup_liodns(void)
         }
 }
 
-irqreturn_t pamu_av_isr(int irq, void *arg)
+static irqreturn_t pamu_av_isr(int irq, void *arg)
 {
         struct pamu_isr_data *data = arg;
         phys_addr_t phys;
@@ -792,14 +779,16 @@ irqreturn_t pamu_av_isr(int irq, void *arg)
                         pr_emerg("POES2=%08x\n", in_be32(p + PAMU_POES2));
                         pr_emerg("AVS1=%08x\n", avs1);
                         pr_emerg("AVS2=%08x\n", in_be32(p + PAMU_AVS2));
-                        pr_emerg("AVA=%016llx\n", make64(in_be32(p + PAMU_AVAH),
-                                in_be32(p + PAMU_AVAL)));
+                        pr_emerg("AVA=%016llx\n",
+                                 make64(in_be32(p + PAMU_AVAH),
+                                        in_be32(p + PAMU_AVAL)));
                         pr_emerg("UDAD=%08x\n", in_be32(p + PAMU_UDAD));
-                        pr_emerg("POEA=%016llx\n", make64(in_be32(p + PAMU_POEAH),
-                                in_be32(p + PAMU_POEAL)));
+                        pr_emerg("POEA=%016llx\n",
+                                 make64(in_be32(p + PAMU_POEAH),
+                                        in_be32(p + PAMU_POEAL)));
 
                         phys = make64(in_be32(p + PAMU_POEAH),
-                                in_be32(p + PAMU_POEAL));
+                                      in_be32(p + PAMU_POEAL));
 
                         /* Assume that POEA points to a PAACE */
                         if (phys) {
@@ -807,11 +796,12 @@ irqreturn_t pamu_av_isr(int irq, void *arg)
 
                                 /* Only the first four words are relevant */
                                 for (j = 0; j < 4; j++)
-                                        pr_emerg("PAACE[%u]=%08x\n", j, in_be32(paace + j));
+                                        pr_emerg("PAACE[%u]=%08x\n",
+                                                 j, in_be32(paace + j));
                         }
 
                         /* clear access violation condition */
-                        out_be32((p + PAMU_AVS1), avs1 & PAMU_AV_MASK);
+                        out_be32(p + PAMU_AVS1, avs1 & PAMU_AV_MASK);
                         paace = pamu_get_ppaace(avs1 >> PAMU_AVS1_LIODN_SHIFT);
                         BUG_ON(!paace);
                         /* check if we got a violation for a disabled LIODN */
@@ -827,13 +817,13 @@ irqreturn_t pamu_av_isr(int irq, void *arg)
                                 /* Disable the LIODN */
                                 ret = pamu_disable_liodn(avs1 >> PAMU_AVS1_LIODN_SHIFT);
                                 BUG_ON(ret);
-                                pr_emerg("Disabling liodn %x\n", avs1 >> PAMU_AVS1_LIODN_SHIFT);
+                                pr_emerg("Disabling liodn %x\n",
+                                         avs1 >> PAMU_AVS1_LIODN_SHIFT);
                         }
                         out_be32((p + PAMU_PICS), pics);
                 }
         }
 
-
         return IRQ_HANDLED;
 }
 
@@ -952,7 +942,7 @@ static int __init create_csd(phys_addr_t phys, size_t size, u32 csd_port_id)
         }
 
         if (i == 0 || i == num_laws) {
-                /* This should never happen*/
+                /* This should never happen */
                 ret = -ENOENT;
                 goto error;
         }
@@ -998,26 +988,27 @@ error:
 static const struct {
         u32 svr;
         u32 port_id;
-} port_id_map[] = {
-        {0x82100010, 0xFF000000},       /* P2040 1.0 */
-        {0x82100011, 0xFF000000},       /* P2040 1.1 */
-        {0x82100110, 0xFF000000},       /* P2041 1.0 */
-        {0x82100111, 0xFF000000},       /* P2041 1.1 */
-        {0x82110310, 0xFF000000},       /* P3041 1.0 */
-        {0x82110311, 0xFF000000},       /* P3041 1.1 */
-        {0x82010020, 0xFFF80000},       /* P4040 2.0 */
-        {0x82000020, 0xFFF80000},       /* P4080 2.0 */
-        {0x82210010, 0xFC000000},       /* P5010 1.0 */
-        {0x82210020, 0xFC000000},       /* P5010 2.0 */
-        {0x82200010, 0xFC000000},       /* P5020 1.0 */
-        {0x82050010, 0xFF800000},       /* P5021 1.0 */
-        {0x82040010, 0xFF800000},       /* P5040 1.0 */
+} port_id_map[] __initconst = {
+        {(SVR_P2040 << 8) | 0x10, 0xFF000000},  /* P2040 1.0 */
+        {(SVR_P2040 << 8) | 0x11, 0xFF000000},  /* P2040 1.1 */
+        {(SVR_P2041 << 8) | 0x10, 0xFF000000},  /* P2041 1.0 */
+        {(SVR_P2041 << 8) | 0x11, 0xFF000000},  /* P2041 1.1 */
+        {(SVR_P3041 << 8) | 0x10, 0xFF000000},  /* P3041 1.0 */
+        {(SVR_P3041 << 8) | 0x11, 0xFF000000},  /* P3041 1.1 */
+        {(SVR_P4040 << 8) | 0x20, 0xFFF80000},  /* P4040 2.0 */
+        {(SVR_P4080 << 8) | 0x20, 0xFFF80000},  /* P4080 2.0 */
+        {(SVR_P5010 << 8) | 0x10, 0xFC000000},  /* P5010 1.0 */
+        {(SVR_P5010 << 8) | 0x20, 0xFC000000},  /* P5010 2.0 */
+        {(SVR_P5020 << 8) | 0x10, 0xFC000000},  /* P5020 1.0 */
+        {(SVR_P5021 << 8) | 0x10, 0xFF800000},  /* P5021 1.0 */
+        {(SVR_P5040 << 8) | 0x10, 0xFF800000},  /* P5040 1.0 */
 };
 
 #define SVR_SECURITY    0x80000 /* The Security (E) bit */
 
 static int __init fsl_pamu_probe(struct platform_device *pdev)
 {
+        struct device *dev = &pdev->dev;
         void __iomem *pamu_regs = NULL;
         struct ccsr_guts __iomem *guts_regs = NULL;
         u32 pamubypenr, pamu_counter;
@@ -1042,22 +1033,21 @@ static int __init fsl_pamu_probe(struct platform_device *pdev)
          * NOTE : All PAMUs share the same LIODN tables.
          */
 
-        pamu_regs = of_iomap(pdev->dev.of_node, 0);
+        pamu_regs = of_iomap(dev->of_node, 0);
         if (!pamu_regs) {
-                dev_err(&pdev->dev, "ioremap of PAMU node failed\n");
+                dev_err(dev, "ioremap of PAMU node failed\n");
                 return -ENOMEM;
         }
-        of_get_address(pdev->dev.of_node, 0, &size, NULL);
+        of_get_address(dev->of_node, 0, &size, NULL);
 
-        irq = irq_of_parse_and_map(pdev->dev.of_node, 0);
+        irq = irq_of_parse_and_map(dev->of_node, 0);
         if (irq == NO_IRQ) {
-                dev_warn(&pdev->dev, "no interrupts listed in PAMU node\n");
+                dev_warn(dev, "no interrupts listed in PAMU node\n");
                 goto error;
         }
 
-        data = kzalloc(sizeof(struct pamu_isr_data), GFP_KERNEL);
+        data = kzalloc(sizeof(*data), GFP_KERNEL);
         if (!data) {
-                dev_err(&pdev->dev, "PAMU isr data memory allocation failed\n");
                 ret = -ENOMEM;
                 goto error;
         }
@@ -1067,15 +1057,14 @@ static int __init fsl_pamu_probe(struct platform_device *pdev)
         /* The ISR needs access to the regs, so we won't iounmap them */
         ret = request_irq(irq, pamu_av_isr, 0, "pamu", data);
         if (ret < 0) {
-                dev_err(&pdev->dev, "error %i installing ISR for irq %i\n",
-                        ret, irq);
+                dev_err(dev, "error %i installing ISR for irq %i\n", ret, irq);
                 goto error;
         }
 
         guts_node = of_find_matching_node(NULL, guts_device_ids);
         if (!guts_node) {
-                dev_err(&pdev->dev, "could not find GUTS node %s\n",
-                        pdev->dev.of_node->full_name);
+                dev_err(dev, "could not find GUTS node %s\n",
+                        dev->of_node->full_name);
                 ret = -ENODEV;
                 goto error;
         }
@@ -1083,7 +1072,7 @@ static int __init fsl_pamu_probe(struct platform_device *pdev)
         guts_regs = of_iomap(guts_node, 0);
         of_node_put(guts_node);
         if (!guts_regs) {
-                dev_err(&pdev->dev, "ioremap of GUTS node failed\n");
+                dev_err(dev, "ioremap of GUTS node failed\n");
                 ret = -ENODEV;
                 goto error;
         }
@@ -1103,7 +1092,7 @@ static int __init fsl_pamu_probe(struct platform_device *pdev)
 
         p = alloc_pages(GFP_KERNEL | __GFP_ZERO, order);
         if (!p) {
-                dev_err(&pdev->dev, "unable to allocate PAACT/SPAACT/OMT block\n");
+                dev_err(dev, "unable to allocate PAACT/SPAACT/OMT block\n");
                 ret = -ENOMEM;
                 goto error;
         }
@@ -1113,7 +1102,7 @@ static int __init fsl_pamu_probe(struct platform_device *pdev)
 
         /* Make sure the memory is naturally aligned */
         if (ppaact_phys & ((PAGE_SIZE << order) - 1)) {
-                dev_err(&pdev->dev, "PAACT/OMT block is unaligned\n");
+                dev_err(dev, "PAACT/OMT block is unaligned\n");
                 ret = -ENOMEM;
                 goto error;
         }
@@ -1121,7 +1110,7 @@ static int __init fsl_pamu_probe(struct platform_device *pdev)
         spaact = (void *)ppaact + (PAGE_SIZE << get_order(PAACT_SIZE));
         omt = (void *)spaact + (PAGE_SIZE << get_order(SPAACT_SIZE));
 
-        dev_dbg(&pdev->dev, "ppaact virt=%p phys=%pa\n", ppaact, &ppaact_phys);
+        dev_dbg(dev, "ppaact virt=%p phys=%pa\n", ppaact, &ppaact_phys);
 
         /* Check to see if we need to implement the work-around on this SOC */
 
@@ -1129,21 +1118,19 @@ static int __init fsl_pamu_probe(struct platform_device *pdev)
         for (i = 0; i < ARRAY_SIZE(port_id_map); i++) {
                 if (port_id_map[i].svr == (mfspr(SPRN_SVR) & ~SVR_SECURITY)) {
                         csd_port_id = port_id_map[i].port_id;
-                        dev_dbg(&pdev->dev, "found matching SVR %08x\n",
+                        dev_dbg(dev, "found matching SVR %08x\n",
                                 port_id_map[i].svr);
                         break;
                 }
         }
 
         if (csd_port_id) {
-                dev_dbg(&pdev->dev, "creating coherency subdomain at address "
-                        "%pa, size %zu, port id 0x%08x", &ppaact_phys,
-                        mem_size, csd_port_id);
+                dev_dbg(dev, "creating coherency subdomain at address %pa, size %zu, port id 0x%08x",
+                        &ppaact_phys, mem_size, csd_port_id);
 
                 ret = create_csd(ppaact_phys, mem_size, csd_port_id);
                 if (ret) {
-                        dev_err(&pdev->dev, "could not create coherence "
-                                "subdomain\n");
+                        dev_err(dev, "could not create coherence subdomain\n");
                         return ret;
                 }
         }
@@ -1154,7 +1141,7 @@ static int __init fsl_pamu_probe(struct platform_device *pdev)
         spaace_pool = gen_pool_create(ilog2(sizeof(struct paace)), -1);
         if (!spaace_pool) {
                 ret = -ENOMEM;
-                dev_err(&pdev->dev, "PAMU : failed to allocate spaace gen pool\n");
+                dev_err(dev, "Failed to allocate spaace gen pool\n");
                 goto error;
         }
 
@@ -1167,9 +1154,9 @@ static int __init fsl_pamu_probe(struct platform_device *pdev)
         for (pamu_reg_off = 0, pamu_counter = 0x80000000; pamu_reg_off < size;
              pamu_reg_off += PAMU_OFFSET, pamu_counter >>= 1) {
 
-                pamu_reg_base = (unsigned long) pamu_regs + pamu_reg_off;
+                pamu_reg_base = (unsigned long)pamu_regs + pamu_reg_off;
                 setup_one_pamu(pamu_reg_base, pamu_reg_off, ppaact_phys,
-                                 spaact_phys, omt_phys);
+                               spaact_phys, omt_phys);
                 /* Disable PAMU bypass for this PAMU */
                 pamubypenr &= ~pamu_counter;
         }
@@ -1181,7 +1168,7 @@ static int __init fsl_pamu_probe(struct platform_device *pdev)
 
         iounmap(guts_regs);
 
-        /* Enable DMA for the LIODNs in the device tree*/
+        /* Enable DMA for the LIODNs in the device tree */
 
         setup_liodns();
 
diff --git a/drivers/iommu/fsl_pamu.h b/drivers/iommu/fsl_pamu.h
index 8fc1a125b16e..aab723f91f12 100644
--- a/drivers/iommu/fsl_pamu.h
+++ b/drivers/iommu/fsl_pamu.h
@@ -19,13 +19,15 @@
 #ifndef __FSL_PAMU_H
 #define __FSL_PAMU_H
 
+#include <linux/iommu.h>
+
 #include <asm/fsl_pamu_stash.h>
 
 /* Bit Field macros
  *      v = bit field variable; m = mask, m##_SHIFT = shift, x = value to load
  */
-#define set_bf(v, m, x)         (v = ((v) & ~(m)) | (((x) << (m##_SHIFT)) & (m)))
-#define get_bf(v, m)            (((v) & (m)) >> (m##_SHIFT))
+#define set_bf(v, m, x)         (v = ((v) & ~(m)) | (((x) << m##_SHIFT) & (m)))
+#define get_bf(v, m)            (((v) & (m)) >> m##_SHIFT)
 
 /* PAMU CCSR space */
 #define PAMU_PGC 0x00000000     /* Allows all peripheral accesses */
@@ -65,7 +67,7 @@ struct pamu_mmap_regs {
 #define PAMU_AVS1_GCV   0x2000
 #define PAMU_AVS1_PDV   0x4000
 #define PAMU_AV_MASK    (PAMU_AVS1_AV | PAMU_AVS1_OTV | PAMU_AVS1_APV | PAMU_AVS1_WAV \
-                        | PAMU_AVS1_LAV | PAMU_AVS1_GCV | PAMU_AVS1_PDV)
+                         | PAMU_AVS1_LAV | PAMU_AVS1_GCV | PAMU_AVS1_PDV)
 #define PAMU_AVS1_LIODN_SHIFT 16
 #define PAMU_LAV_LIODN_NOT_IN_PPAACT 0x400
 
@@ -198,8 +200,7 @@ struct pamu_mmap_regs {
 #define PAACE_ATM_NO_XLATE      0x00
 #define PAACE_ATM_WINDOW_XLATE  0x01
 #define PAACE_ATM_PAGE_XLATE    0x02
-#define PAACE_ATM_WIN_PG_XLATE  \
-                (PAACE_ATM_WINDOW_XLATE | PAACE_ATM_PAGE_XLATE)
+#define PAACE_ATM_WIN_PG_XLATE  (PAACE_ATM_WINDOW_XLATE | PAACE_ATM_PAGE_XLATE)
 #define PAACE_OTM_NO_XLATE      0x00
 #define PAACE_OTM_IMMEDIATE     0x01
 #define PAACE_OTM_INDEXED       0x02
@@ -219,7 +220,7 @@ struct pamu_mmap_regs {
 #define PAACE_TCEF_FORMAT0_8B   0x00
 #define PAACE_TCEF_FORMAT1_RSVD 0x01
 /*
- * Hard coded value for the PAACT size to accomodate
+ * Hard coded value for the PAACT size to accommodate
  * maximum LIODN value generated by u-boot.
  */
 #define PAACE_NUMBER_ENTRIES    0x500
@@ -332,7 +333,7 @@ struct paace {
 #define NUM_MOE 128
 struct ome {
         u8 moe[NUM_MOE];
-} __attribute__((packed));
+} __packed;
 
 #define PAACT_SIZE              (sizeof(struct paace) * PAACE_NUMBER_ENTRIES)
 #define SPAACT_SIZE              (sizeof(struct paace) * SPAACE_NUMBER_ENTRIES)
diff --git a/drivers/iommu/fsl_pamu_domain.c b/drivers/iommu/fsl_pamu_domain.c
index c828f80d48b0..ceebd287b660 100644
--- a/drivers/iommu/fsl_pamu_domain.c
+++ b/drivers/iommu/fsl_pamu_domain.c
@@ -19,26 +19,10 @@
 
 #define pr_fmt(fmt)    "fsl-pamu-domain: %s: " fmt, __func__
 
-#include <linux/init.h>
-#include <linux/iommu.h>
-#include <linux/notifier.h>
-#include <linux/slab.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/mm.h>
-#include <linux/interrupt.h>
-#include <linux/device.h>
-#include <linux/of_platform.h>
-#include <linux/bootmem.h>
-#include <linux/err.h>
-#include <asm/io.h>
-#include <asm/bitops.h>
-
-#include <asm/pci-bridge.h>
-#include <sysdev/fsl_pci.h>
-
 #include "fsl_pamu_domain.h"
 
+#include <sysdev/fsl_pci.h>
+
 /*
  * Global spinlock that needs to be held while
  * configuring PAMU.
@@ -51,23 +35,21 @@ static DEFINE_SPINLOCK(device_domain_lock);
 
 static int __init iommu_init_mempool(void)
 {
-
         fsl_pamu_domain_cache = kmem_cache_create("fsl_pamu_domain",
-                                         sizeof(struct fsl_dma_domain),
-                                         0,
-                                         SLAB_HWCACHE_ALIGN,
-
-                                         NULL);
+                                                  sizeof(struct fsl_dma_domain),
+                                                  0,
+                                                  SLAB_HWCACHE_ALIGN,
+                                                  NULL);
         if (!fsl_pamu_domain_cache) {
                 pr_debug("Couldn't create fsl iommu_domain cache\n");
                 return -ENOMEM;
         }
 
         iommu_devinfo_cache = kmem_cache_create("iommu_devinfo",
-                                         sizeof(struct device_domain_info),
-                                         0,
-                                         SLAB_HWCACHE_ALIGN,
-                                         NULL);
+                                                sizeof(struct device_domain_info),
+                                                0,
+                                                SLAB_HWCACHE_ALIGN,
+                                                NULL);
         if (!iommu_devinfo_cache) {
                 pr_debug("Couldn't create devinfo cache\n");
                 kmem_cache_destroy(fsl_pamu_domain_cache);
@@ -80,8 +62,7 @@ static int __init iommu_init_mempool(void)
 static phys_addr_t get_phys_addr(struct fsl_dma_domain *dma_domain, dma_addr_t iova)
 {
         u32 win_cnt = dma_domain->win_cnt;
-        struct dma_window *win_ptr =
-                                &dma_domain->win_arr[0];
+        struct dma_window *win_ptr = &dma_domain->win_arr[0];
         struct iommu_domain_geometry *geom;
 
         geom = &dma_domain->iommu_domain->geometry;
@@ -103,22 +84,20 @@ static phys_addr_t get_phys_addr(struct fsl_dma_domain *dma_domain, dma_addr_t i
         }
 
         if (win_ptr->valid)
-                return (win_ptr->paddr + (iova & (win_ptr->size - 1)));
+                return win_ptr->paddr + (iova & (win_ptr->size - 1));
 
         return 0;
 }
 
 static int map_subwins(int liodn, struct fsl_dma_domain *dma_domain)
 {
-        struct dma_window *sub_win_ptr =
-                                &dma_domain->win_arr[0];
+        struct dma_window *sub_win_ptr = &dma_domain->win_arr[0];
         int i, ret;
         unsigned long rpn, flags;
 
         for (i = 0; i < dma_domain->win_cnt; i++) {
                 if (sub_win_ptr[i].valid) {
-                        rpn = sub_win_ptr[i].paddr >>
-                                 PAMU_PAGE_SHIFT;
+                        rpn = sub_win_ptr[i].paddr >> PAMU_PAGE_SHIFT;
                         spin_lock_irqsave(&iommu_lock, flags);
                         ret = pamu_config_spaace(liodn, dma_domain->win_cnt, i,
                                                  sub_win_ptr[i].size,
@@ -130,7 +109,7 @@ static int map_subwins(int liodn, struct fsl_dma_domain *dma_domain)
                                                  sub_win_ptr[i].prot);
                         spin_unlock_irqrestore(&iommu_lock, flags);
                         if (ret) {
-                                pr_debug("PAMU SPAACE configuration failed for liodn %d\n",
+                                pr_debug("SPAACE configuration failed for liodn %d\n",
                                          liodn);
                                 return ret;
                         }
@@ -156,8 +135,7 @@ static int map_win(int liodn, struct fsl_dma_domain *dma_domain)
                                  0, wnd->prot);
         spin_unlock_irqrestore(&iommu_lock, flags);
         if (ret)
-                pr_debug("PAMU PAACE configuration failed for liodn %d\n",
-                        liodn);
+                pr_debug("PAACE configuration failed for liodn %d\n", liodn);
 
         return ret;
 }
@@ -169,7 +147,6 @@ static int map_liodn(int liodn, struct fsl_dma_domain *dma_domain)
                 return map_subwins(liodn, dma_domain);
         else
                 return map_win(liodn, dma_domain);
-
 }
 
 /* Update window/subwindow mapping for the LIODN */
@@ -190,7 +167,8 @@ static int update_liodn(int liodn, struct fsl_dma_domain *dma_domain, u32 wnd_nr
                                          (wnd_nr > 0) ? 1 : 0,
                                          wnd->prot);
                 if (ret)
-                        pr_debug("Subwindow reconfiguration failed for liodn %d\n", liodn);
+                        pr_debug("Subwindow reconfiguration failed for liodn %d\n",
+                                 liodn);
         } else {
                 phys_addr_t wnd_addr;
 
@@ -200,10 +178,11 @@ static int update_liodn(int liodn, struct fsl_dma_domain *dma_domain, u32 wnd_nr
                                          wnd->size,
                                          ~(u32)0,
                                          wnd->paddr >> PAMU_PAGE_SHIFT,
-                                        dma_domain->snoop_id, dma_domain->stash_id,
-                                        0, wnd->prot);
+                                         dma_domain->snoop_id, dma_domain->stash_id,
+                                         0, wnd->prot);
                 if (ret)
-                        pr_debug("Window reconfiguration failed for liodn %d\n", liodn);
+                        pr_debug("Window reconfiguration failed for liodn %d\n",
+                                 liodn);
         }
 
         spin_unlock_irqrestore(&iommu_lock, flags);
@@ -212,14 +191,15 @@ static int update_liodn(int liodn, struct fsl_dma_domain *dma_domain, u32 wnd_nr
 }
 
 static int update_liodn_stash(int liodn, struct fsl_dma_domain *dma_domain,
-                                 u32 val)
+                              u32 val)
 {
         int ret = 0, i;
         unsigned long flags;
 
         spin_lock_irqsave(&iommu_lock, flags);
         if (!dma_domain->win_arr) {
-                pr_debug("Windows not configured, stash destination update failed for liodn %d\n", liodn);
+                pr_debug("Windows not configured, stash destination update failed for liodn %d\n",
+                         liodn);
                 spin_unlock_irqrestore(&iommu_lock, flags);
                 return -EINVAL;
         }
@@ -227,7 +207,8 @@ static int update_liodn_stash(int liodn, struct fsl_dma_domain *dma_domain,
         for (i = 0; i < dma_domain->win_cnt; i++) {
                 ret = pamu_update_paace_stash(liodn, i, val);
                 if (ret) {
-                        pr_debug("Failed to update SPAACE %d field for liodn %d\n ", i, liodn);
+                        pr_debug("Failed to update SPAACE %d field for liodn %d\n ",
+                                 i, liodn);
                         spin_unlock_irqrestore(&iommu_lock, flags);
                         return ret;
                 }
@@ -240,9 +221,9 @@ static int update_liodn_stash(int liodn, struct fsl_dma_domain *dma_domain,
 
 /* Set the geometry parameters for a LIODN */
 static int pamu_set_liodn(int liodn, struct device *dev,
-                           struct fsl_dma_domain *dma_domain,
-                           struct iommu_domain_geometry *geom_attr,
-                           u32 win_cnt)
+                          struct fsl_dma_domain *dma_domain,
+                          struct iommu_domain_geometry *geom_attr,
+                          u32 win_cnt)
 {
         phys_addr_t window_addr, window_size;
         phys_addr_t subwin_size;
@@ -268,7 +249,8 @@ static int pamu_set_liodn(int liodn, struct device *dev,
                                          dma_domain->stash_id, win_cnt, 0);
         spin_unlock_irqrestore(&iommu_lock, flags);
         if (ret) {
-                pr_debug("PAMU PAACE configuration failed for liodn %d, win_cnt =%d\n", liodn, win_cnt);
+                pr_debug("PAACE configuration failed for liodn %d, win_cnt =%d\n",
+                         liodn, win_cnt);
                 return ret;
         }
 
@@ -285,7 +267,8 @@ static int pamu_set_liodn(int liodn, struct device *dev,
                                                          0, 0);
                         spin_unlock_irqrestore(&iommu_lock, flags);
                         if (ret) {
-                                pr_debug("PAMU SPAACE configuration failed for liodn %d\n", liodn);
+                                pr_debug("SPAACE configuration failed for liodn %d\n",
+                                         liodn);
                                 return ret;
                         }
                 }
@@ -301,13 +284,13 @@ static int check_size(u64 size, dma_addr_t iova)
          * to PAMU page size.
          */
         if ((size & (size - 1)) || size < PAMU_PAGE_SIZE) {
-                pr_debug("%s: size too small or not a power of two\n", __func__);
+                pr_debug("Size too small or not a power of two\n");
                 return -EINVAL;
         }
 
-        /* iova must be page size aligned*/
+        /* iova must be page size aligned */
         if (iova & (size - 1)) {
-                pr_debug("%s: address is not aligned with window size\n", __func__);
+                pr_debug("Address is not aligned with window size\n");
                 return -EINVAL;
         }
 
@@ -396,16 +379,15 @@ static void attach_device(struct fsl_dma_domain *dma_domain, int liodn, struct d
         if (!dev->archdata.iommu_domain)
                 dev->archdata.iommu_domain = info;
         spin_unlock_irqrestore(&device_domain_lock, flags);
-
 }
 
 static phys_addr_t fsl_pamu_iova_to_phys(struct iommu_domain *domain,
-                                            dma_addr_t iova)
+                                         dma_addr_t iova)
 {
         struct fsl_dma_domain *dma_domain = domain->priv;
 
-        if ((iova < domain->geometry.aperture_start) ||
-                iova > (domain->geometry.aperture_end))
+        if (iova < domain->geometry.aperture_start ||
+            iova > domain->geometry.aperture_end)
                 return 0;
 
         return get_phys_addr(dma_domain, iova);
@@ -460,7 +442,7 @@ static int pamu_set_domain_geometry(struct fsl_dma_domain *dma_domain,
 
         list_for_each_entry(info, &dma_domain->devices, link) {
                 ret = pamu_set_liodn(info->liodn, info->dev, dma_domain,
-                                      geom_attr, win_cnt);
+                                     geom_attr, win_cnt);
                 if (ret)
                         break;
         }
@@ -543,7 +525,6 @@ static void fsl_pamu_window_disable(struct iommu_domain *domain, u32 wnd_nr)
         }
 
         spin_unlock_irqrestore(&dma_domain->domain_lock, flags);
-
 }
 
 static int fsl_pamu_window_enable(struct iommu_domain *domain, u32 wnd_nr,
@@ -576,7 +557,7 @@ static int fsl_pamu_window_enable(struct iommu_domain *domain, u32 wnd_nr,
 
         win_size = dma_domain->geom_size >> ilog2(dma_domain->win_cnt);
         if (size > win_size) {
-                pr_debug("Invalid window size \n");
+                pr_debug("Invalid window size\n");
                 spin_unlock_irqrestore(&dma_domain->domain_lock, flags);
                 return -EINVAL;
         }
@@ -622,8 +603,8 @@ static int fsl_pamu_window_enable(struct iommu_domain *domain, u32 wnd_nr,
  * and window mappings.
  */
 static int handle_attach_device(struct fsl_dma_domain *dma_domain,
-                                 struct device *dev, const u32 *liodn,
-                                 int num)
+                                struct device *dev, const u32 *liodn,
+                                int num)
 {
         unsigned long flags;
         struct iommu_domain *domain = dma_domain->iommu_domain;
@@ -632,11 +613,10 @@ static int handle_attach_device(struct fsl_dma_domain *dma_domain,
 
         spin_lock_irqsave(&dma_domain->domain_lock, flags);
         for (i = 0; i < num; i++) {
-
                 /* Ensure that LIODN value is valid */
                 if (liodn[i] >= PAACE_NUMBER_ENTRIES) {
                         pr_debug("Invalid liodn %d, attach device failed for %s\n",
-                                liodn[i], dev->of_node->full_name);
+                                 liodn[i], dev->of_node->full_name);
                         ret = -EINVAL;
                         break;
                 }
@@ -649,9 +629,9 @@ static int handle_attach_device(struct fsl_dma_domain *dma_domain,
                  */
                 if (dma_domain->win_arr) {
                         u32 win_cnt = dma_domain->win_cnt > 1 ? dma_domain->win_cnt : 0;
+
                         ret = pamu_set_liodn(liodn[i], dev, dma_domain,
-                                              &domain->geometry,
-                                              win_cnt);
+                                             &domain->geometry, win_cnt);
                         if (ret)
                                 break;
                         if (dma_domain->mapped) {
@@ -698,19 +678,18 @@ static int fsl_pamu_attach_device(struct iommu_domain *domain,
         liodn = of_get_property(dev->of_node, "fsl,liodn", &len);
         if (liodn) {
                 liodn_cnt = len / sizeof(u32);
-                ret = handle_attach_device(dma_domain, dev,
-                                         liodn, liodn_cnt);
+                ret = handle_attach_device(dma_domain, dev, liodn, liodn_cnt);
         } else {
                 pr_debug("missing fsl,liodn property at %s\n",
-                          dev->of_node->full_name);
-                        ret = -EINVAL;
+                         dev->of_node->full_name);
+                ret = -EINVAL;
         }
 
         return ret;
 }
 
 static void fsl_pamu_detach_device(struct iommu_domain *domain,
-                                      struct device *dev)
+                                   struct device *dev)
 {
         struct fsl_dma_domain *dma_domain = domain->priv;
         const u32 *prop;
@@ -738,7 +717,7 @@ static void fsl_pamu_detach_device(struct iommu_domain *domain,
                 detach_device(dev, dma_domain);
         else
                 pr_debug("missing fsl,liodn property at %s\n",
-                          dev->of_node->full_name);
+                         dev->of_node->full_name);
 }
 
 static  int configure_domain_geometry(struct iommu_domain *domain, void *data)
@@ -754,10 +733,10 @@ static  int configure_domain_geometry(struct iommu_domain *domain, void *data)
          * DMA outside of the geometry.
          */
         if (check_size(geom_size, geom_attr->aperture_start) ||
-                !geom_attr->force_aperture) {
-                        pr_debug("Invalid PAMU geometry attributes\n");
-                        return -EINVAL;
-                }
+            !geom_attr->force_aperture) {
+                pr_debug("Invalid PAMU geometry attributes\n");
+                return -EINVAL;
+        }
 
         spin_lock_irqsave(&dma_domain->domain_lock, flags);
         if (dma_domain->enabled) {
@@ -786,7 +765,7 @@ static int configure_domain_stash(struct fsl_dma_domain *dma_domain, void *data)
         spin_lock_irqsave(&dma_domain->domain_lock, flags);
 
         memcpy(&dma_domain->dma_stash, stash_attr,
-                 sizeof(struct pamu_stash_attribute));
+               sizeof(struct pamu_stash_attribute));
 
         dma_domain->stash_id = get_stash_id(stash_attr->cache,
                                             stash_attr->cpu);
@@ -803,7 +782,7 @@ static int configure_domain_stash(struct fsl_dma_domain *dma_domain, void *data)
         return ret;
 }
 
-/* Configure domain dma state i.e. enable/disable DMA*/
+/* Configure domain dma state i.e. enable/disable DMA */
 static int configure_domain_dma_state(struct fsl_dma_domain *dma_domain, bool enable)
 {
         struct device_domain_info *info;
@@ -819,8 +798,7 @@ static int configure_domain_dma_state(struct fsl_dma_domain *dma_domain, bool en
         }
 
         dma_domain->enabled = enable;
-        list_for_each_entry(info, &dma_domain->devices,
-                                 link) {
+        list_for_each_entry(info, &dma_domain->devices, link) {
                 ret = (enable) ? pamu_enable_liodn(info->liodn) :
                         pamu_disable_liodn(info->liodn);
                 if (ret)
@@ -833,12 +811,11 @@ static int configure_domain_dma_state(struct fsl_dma_domain *dma_domain, bool en
 }
 
 static int fsl_pamu_set_domain_attr(struct iommu_domain *domain,
-                                 enum iommu_attr attr_type, void *data)
+                                    enum iommu_attr attr_type, void *data)
 {
         struct fsl_dma_domain *dma_domain = domain->priv;
         int ret = 0;
 
-
         switch (attr_type) {
         case DOMAIN_ATTR_GEOMETRY:
                 ret = configure_domain_geometry(domain, data);
@@ -853,22 +830,21 @@ static int fsl_pamu_set_domain_attr(struct iommu_domain *domain,
                 pr_debug("Unsupported attribute type\n");
                 ret = -EINVAL;
                 break;
-        };
+        }
 
         return ret;
 }
 
 static int fsl_pamu_get_domain_attr(struct iommu_domain *domain,
-                                 enum iommu_attr attr_type, void *data)
+                                    enum iommu_attr attr_type, void *data)
 {
         struct fsl_dma_domain *dma_domain = domain->priv;
         int ret = 0;
 
-
         switch (attr_type) {
         case DOMAIN_ATTR_FSL_PAMU_STASH:
-                memcpy((struct pamu_stash_attribute *) data, &dma_domain->dma_stash,
-                                 sizeof(struct pamu_stash_attribute));
+                memcpy(data, &dma_domain->dma_stash,
+                       sizeof(struct pamu_stash_attribute));
                 break;
         case DOMAIN_ATTR_FSL_PAMU_ENABLE:
                 *(int *)data = dma_domain->enabled;
@@ -880,7 +856,7 @@ static int fsl_pamu_get_domain_attr(struct iommu_domain *domain,
                 pr_debug("Unsupported attribute type\n");
                 ret = -EINVAL;
                 break;
-        };
+        }
 
         return ret;
 }
@@ -903,11 +879,8 @@ static  bool check_pci_ctl_endpt_part(struct pci_controller *pci_ctl)
         /* Check the PCI controller version number by readding BRR1 register */
         version = in_be32(pci_ctl->cfg_addr + (PCI_FSL_BRR1 >> 2));
         version &= PCI_FSL_BRR1_VER;
-        /* If PCI controller version is >= 0x204 we can partition endpoints*/
-        if (version >= 0x204)
-                return 1;
-
-        return 0;
+        /* If PCI controller version is >= 0x204 we can partition endpoints */
+        return version >= 0x204;
 }
 
 /* Get iommu group information from peer devices or devices on the parent bus */
@@ -968,8 +941,9 @@ static struct iommu_group *get_pci_device_group(struct pci_dev *pdev)
                 if (pci_ctl->parent->iommu_group) {
                         group = get_device_iommu_group(pci_ctl->parent);
                         iommu_group_remove_device(pci_ctl->parent);
-                } else
+                } else {
                         group = get_shared_pci_device_group(pdev);
+                }
         }
 
         if (!group)
@@ -1055,11 +1029,12 @@ static int fsl_pamu_set_windows(struct iommu_domain *domain, u32 w_count)
         }
 
         ret = pamu_set_domain_geometry(dma_domain, &domain->geometry,
-                                ((w_count > 1) ? w_count : 0));
+                                       w_count > 1 ? w_count : 0);
         if (!ret) {
                 kfree(dma_domain->win_arr);
-                dma_domain->win_arr = kzalloc(sizeof(struct dma_window) *
-                                                          w_count, GFP_ATOMIC);
+                dma_domain->win_arr = kcalloc(w_count,
+                                              sizeof(*dma_domain->win_arr),
+                                              GFP_ATOMIC);
                 if (!dma_domain->win_arr) {
                         spin_unlock_irqrestore(&dma_domain->domain_lock, flags);
                         return -ENOMEM;
@@ -1095,7 +1070,7 @@ static const struct iommu_ops fsl_pamu_ops = {
         .remove_device  = fsl_pamu_remove_device,
 };
 
-int pamu_domain_init(void)
+int __init pamu_domain_init(void)
 {
         int ret = 0;