system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-22 20:37:18 +00:00
Code Issues Packages Projects 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
Show stats Download patch file Download diff file Expand all files Collapse all files

18
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;
} }
@ -638,10 +638,10 @@ static inline int is_buf_blank(uint8_t *buf, size_t len)
} }
static void pxa3xx_nand_cmdfunc(struct mtd_info *mtd, unsigned command, static void pxa3xx_nand_cmdfunc(struct mtd_info *mtd, unsigned command,
int column, int page_addr ) int column, int page_addr)
{ {
struct pxa3xx_nand_info *info = mtd->priv; struct pxa3xx_nand_info *info = mtd->priv;
struct pxa3xx_nand_flash * flash_info = info->flash_info; struct pxa3xx_nand_flash *flash_info = info->flash_info;
struct pxa3xx_nand_cmdset *cmdset = flash_info->cmdset; struct pxa3xx_nand_cmdset *cmdset = flash_info->cmdset;
int ret; int ret;
@ -1040,7 +1040,7 @@ static void pxa3xx_nand_init_mtd(struct mtd_info *mtd,
else else
this->ecc.layout = &hw_smallpage_ecclayout; this->ecc.layout = &hw_smallpage_ecclayout;
this->chip_delay= 25; this->chip_delay = 25;
} }
static int pxa3xx_nand_probe(struct platform_device *pdev) static int pxa3xx_nand_probe(struct platform_device *pdev)
@ -1054,17 +1054,17 @@ 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;
} }
info = (struct pxa3xx_nand_info *)(&mtd[1]); info = (struct pxa3xx_nand_info *)(&mtd[1]);
info->pdev = pdev; info->pdev = pdev;