lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[MTD] [NAND] Fix checkpatch errors in pxa3xx_nand

Browse Source 
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
David Woodhouse
2008-04-22 20:39:43 +01:00
parent 1b0a062be7
commit a1c06ee11f
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/mtd/nand/pxa3xx_nand.c
View File

@@ -18,8 +18,8 @@
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h> #include <linux/mtd/nand.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <asm/io.h> #include <linux/io.h>
#include <asm/irq.h> #include <linux/irq.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/arch/pxa-regs.h> #include <asm/arch/pxa-regs.h>
@@ -494,7 +494,7 @@ static int handle_data_pio(struct pxa3xx_nand_info *info)
info->data_size << 2); info->data_size << 2);
break; break;
default: default:
printk(KERN_ERR "%s: invalid state %d\n", __FUNCTION__, printk(KERN_ERR "%s: invalid state %d\n", __func__,
info->state); info->state);
return -EINVAL; return -EINVAL;
} }
@@ -1054,14 +1054,14 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
pdata = pdev->dev.platform_data; pdata = pdev->dev.platform_data;
if (pdata == NULL) { if (!pdata) {
dev_err(&pdev->dev, "no platform data defined\n"); dev_err(&pdev->dev, "no platform data defined\n");
return -ENODEV; return -ENODEV;
} }
mtd = kzalloc(sizeof(struct mtd_info) + sizeof(struct pxa3xx_nand_info), mtd = kzalloc(sizeof(struct mtd_info) + sizeof(struct pxa3xx_nand_info),
GFP_KERNEL); GFP_KERNEL);
if (mtd == NULL) { if (!mtd) {
dev_err(&pdev->dev, "failed to allocate memory\n"); dev_err(&pdev->dev, "failed to allocate memory\n");
return -ENOMEM; return -ENOMEM;
} }