diff options
Diffstat (limited to 'kernel/drivers/staging/goldfish')
-rw-r--r-- | kernel/drivers/staging/goldfish/goldfish_audio.c | 2 | ||||
-rw-r--r-- | kernel/drivers/staging/goldfish/goldfish_nand.c | 6 | ||||
-rw-r--r-- | kernel/drivers/staging/goldfish/goldfish_nand_reg.h | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/kernel/drivers/staging/goldfish/goldfish_audio.c b/kernel/drivers/staging/goldfish/goldfish_audio.c index 702ae04df..b0927e49d 100644 --- a/kernel/drivers/staging/goldfish/goldfish_audio.c +++ b/kernel/drivers/staging/goldfish/goldfish_audio.c @@ -63,7 +63,7 @@ struct goldfish_audio { #define AUDIO_READ(data, addr) (readl(data->reg_base + addr)) #define AUDIO_WRITE(data, addr, x) (writel(x, data->reg_base + addr)) #define AUDIO_WRITE64(data, addr, addr2, x) \ - (gf_write64((u64)(x), data->reg_base + addr, data->reg_base+addr2)) + (gf_write_dma_addr((x), data->reg_base + addr, data->reg_base+addr2)) /* * temporary variable used between goldfish_audio_probe() and diff --git a/kernel/drivers/staging/goldfish/goldfish_nand.c b/kernel/drivers/staging/goldfish/goldfish_nand.c index 213877a2c..623353db5 100644 --- 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); diff --git a/kernel/drivers/staging/goldfish/goldfish_nand_reg.h b/kernel/drivers/staging/goldfish/goldfish_nand_reg.h index fe7f47c7a..43aeba3a4 100644 --- a/kernel/drivers/staging/goldfish/goldfish_nand_reg.h +++ b/kernel/drivers/staging/goldfish/goldfish_nand_reg.h @@ -66,11 +66,11 @@ enum nand_reg { }; struct cmd_params { - uint32_t dev; - uint32_t addr_low; - uint32_t addr_high; - uint32_t transfer_size; + u32 dev; + u32 addr_low; + u32 addr_high; + u32 transfer_size; unsigned long data; - uint32_t result; + u32 result; }; #endif |