Skip to contentSkip to conversation

pxa3xx_nand: make scan procedure more clear

PATCH New Lei Wen 1 participant 1 message Mar 22, 2010

Subsystems (2)
lore
Share & tools
lore

Lei Wen

author
#0 lore raw

PATCH 1/1 pxa3xx_nand: make scan procedure more clear

---
 drivers/mtd/nand/pxa3xx_nand.c |   66 +++++++++++++++++++++++----------------
 1 files changed, 39 insertions(+), 27 deletions(-)
drivers/mtd/nand/pxa3xx_nand.c +4 -11
index 2dfe6d9..0ef9bf9 100644
@@ -160,6 +160,7 @@ struct pxa3xx_nand_info {
 	unsigned int 		buf_start;
 	unsigned int		buf_count;
 
+	struct mtd_info         *mtd;
 	/* DMA information */
 	int			drcmr_dat;
 	int			drcmr_cmd;
@@ -1096,21 +1097,13 @@ static void pxa3xx_nand_init_mtd(struct mtd_info *mtd,
 	this->chip_delay = 25;
 }
 
-static int __devinit pxa3xx_nand_probe(struct platform_device *pdev)
+static int alloc_nand_resource(struct platform_device *pdev)
 {
-	struct pxa3xx_nand_platform_data *pdata;
+	struct pxa3xx_nand_platform_data *pdata = pdev->dev.platform_data;
 	struct pxa3xx_nand_info *info;
-	struct nand_chip *this;
 	struct mtd_info *mtd;
 	struct resource *r;
-	int ret = 0, irq;
-
-	pdata = pdev->dev.platform_data;
-
-	if (!pdata) {
-		dev_err(&pdev->dev, "no platform data defined\n");
-		return -ENODEV;
-	}
+	int ret, irq;
 
 	mtd = kzalloc(sizeof(struct mtd_info) + sizeof(struct pxa3xx_nand_info),
 			GFP_KERNEL);
@@ -1122,8 +1115,8 @@ static int __devinit pxa3xx_nand_probe(struct

platform_device *pdev)
info = (struct pxa3xx_nand_info *)(&mtd[1]); info->pdev = pdev;

- this = &info->nand_chip;
mtd->priv = info;
+ info->mtd = mtd;
mtd->owner = THIS_MODULE;

info->clk = clk_get(&pdev->dev, NULL);
@@ -1201,16 +1194,9 @@ static int __devinit pxa3xx_nand_probe(struct platform_device *pdev)
}

pxa3xx_nand_init_mtd(mtd, info);
+ platform_set_drvdata(pdev, info);

- platform_set_drvdata(pdev, mtd);
-
- if (nand_scan(mtd, 1)) {
- dev_err(&pdev->dev, "failed to scan nand\n");
- ret = -ENXIO;
- goto fail_free_irq;
- }
-
- return add_mtd_partitions(mtd, pdata->parts, pdata->nr_parts);
+ return 0;

fail_free_irq:
free_irq(irq, info);
@@ -1235,8 +1221,8 @@ fail_free_mtd:

static int pxa3xx_nand_remove(struct platform_device *pdev) {
- struct mtd_info *mtd = platform_get_drvdata(pdev);
- struct pxa3xx_nand_info *info = mtd->priv;
+ struct pxa3xx_nand_info *info = platform_get_drvdata(pdev);
+ struct mtd_info *mtd = info->mtd;
struct resource *r;
int irq;

@@ -1265,11 +1251,37 @@ static int pxa3xx_nand_remove(struct platform_device *pdev)
return 0;
}

+static int __devinit pxa3xx_nand_probe(struct platform_device *pdev) +{
+ struct pxa3xx_nand_platform_data *pdata;
+ struct pxa3xx_nand_info *info;
+ int ret;
+
+ pdata = pdev->dev.platform_data;
+ if (!pdata) {
+ dev_err(&pdev->dev, "no platform data defined\n");
+ return -ENODEV;
+ }
+
+ ret = alloc_nand_resource(pdev);
+ if (ret)
+ return ret;
+
+ info = platform_get_drvdata(pdev);
+ if (nand_scan(info->mtd, 1)) {
+ dev_err(&pdev->dev, "failed to scan nand\n");
+ pxa3xx_nand_remove(pdev);
+ return -ENODEV;
+ }
+
+ return add_mtd_partitions(info->mtd, pdata->parts, pdata->nr_parts);
+}
+
#ifdef CONFIG_PM
static int pxa3xx_nand_suspend(struct platform_device *pdev,
pm_message_t state)
{
- struct mtd_info *mtd = (struct mtd_info *)platform_get_drvdata(pdev);
- struct pxa3xx_nand_info *info = mtd->priv;
+ struct pxa3xx_nand_info *info = platform_get_drvdata(pdev);
+ struct mtd_info *mtd = info->mtd;

if (info->state != STATE_READY) {
dev_err(&pdev->dev, "driver busy, state = %d\n", info->state);
@@ -1281,8 +1293,8 @@ static int pxa3xx_nand_suspend(struct platform_device *pdev, pm_message_t state)

static int pxa3xx_nand_resume(struct platform_device *pdev) {
- struct mtd_info *mtd = (struct mtd_info *)platform_get_drvdata(pdev);
- struct pxa3xx_nand_info *info = mtd->priv;
+ struct pxa3xx_nand_info *info = platform_get_drvdata(pdev);
+ struct mtd_info *mtd = info->mtd;

nand_writel(info, NDTR0CS0, info->ndtr0cs0); nand_writel(info, NDTR1CS0, info->ndtr1cs0);

Signature · 1 line
1.5.6.5