These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / goldfish / goldfish_nand.c

diff --git a/kernel/drivers/staging/goldfish/goldfish_nand.c b/kernel/drivers/staging/goldfish/goldfish_nand.c
index 213877a..623353d 100644 (file)
--- a/kernel/drivers/staging/goldfish/goldfish_nand.c
+++ b/kernel/drivers/staging/goldfish/goldfish_nand.c
@@ -48,7 +48,7 @@ static u32 goldfish_nand_cmd_with_params(struct mtd_info *mtd,
        struct cmd_params *cps = nand->cmd_params;
        unsigned char __iomem  *base = nand->base;
 
-       if (cps == NULL)
+       if (!cps)
                return -1;
 
        switch (cmd) {
@@ -87,7 +87,7 @@ static u32 goldfish_nand_cmd(struct mtd_info *mtd, enum nand_cmd cmd,
                writel((u32)(addr >> 32), base + NAND_ADDR_HIGH);
                writel((u32)addr, base + NAND_ADDR_LOW);
                writel(len, base + NAND_TRANSFER_SIZE);
-               gf_write64((u64)ptr, base + NAND_DATA, base + NAND_DATA_HIGH);
+               gf_write_ptr(ptr, base + NAND_DATA, base + NAND_DATA_HIGH);
                writel(cmd, base + NAND_COMMAND);
                rv = readl(base + NAND_RESULT);
        }
@@ -379,7 +379,7 @@ static int goldfish_nand_probe(struct platform_device *pdev)
        unsigned char __iomem  *base;
 
        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (r == NULL)
+       if (!r)
                return -ENODEV;
 
        base = devm_ioremap(&pdev->dev, r->start, PAGE_SIZE);