Skip to contentSkip to conversation

mtd: nand: pxa3xx: use nand_set_controller_data

PATCH New Chris Packham 1 participant 2 messages Aug 29, 2016 – Sep 1, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mtd: nand: pxa3xx: use nand_set_controller_data

In commit 17cb4b8f327e ("mtd: nand: Add+use mtd_to/from_nand and nand_get/set_controller_data") the assignment of mtd->priv was removed but was not replaced. This adds the required nand_set_controller_data() call.

---

 drivers/mtd/nand/pxa3xx_nand.c | 1 +
 1 file changed, 1 insertion(+)
drivers/mtd/nand/pxa3xx_nand.c +1 -0
index d3ac5391f156..b1d58e036a1d 100644
@@ -1496,6 +1496,7 @@ static int alloc_nand_resource(struct pxa3xx_nand_info *info)
 		host->read_id_bytes = 4;
 		mtd->owner = THIS_MODULE;
 
+		nand_set_controller_data(chip, host);
 		chip->ecc.read_page	= pxa3xx_nand_read_page_hwecc;
 		chip->ecc.write_page	= pxa3xx_nand_write_page_hwecc;
 		chip->controller        = &info->controller;
Signature · 1 line
2.9.2.518.ged577c6.dirty
#1 lore raw

PATCH 1/1 mtd: nand: pxa3xx: use nand_set_controller_data

Quoted 24 lines · Chris Packham

In commit 17cb4b8f327e ("mtd: nand: Add+use mtd_to/from_nand and nand_get/set_controller_data") the assignment of mtd->priv was removed but was not replaced. This adds the required nand_set_controller_data() call.

---

 drivers/mtd/nand/pxa3xx_nand.c | 1 +
 1 file changed, 1 insertion(+)
drivers/mtd/nand/pxa3xx_nand.c +1 -1
index d3ac5391f156..b1d58e036a1d 100644
@@ -1496,6 +1496,7 @@ static int alloc_nand_resource(struct pxa3xx_nand_info *info)
                host->read_id_bytes = 4;
                mtd->owner = THIS_MODULE;
 
+               nand_set_controller_data(chip, host);
                chip->ecc.read_page     = pxa3xx_nand_read_page_hwecc;
                chip->ecc.write_page    = pxa3xx_nand_write_page_hwecc;
                chip->controller        = &info->controller;
--
Quoted 2 lines

2.9.2.518.ged577c6.dirty

Ping? I think this probably needs to be in for 2016.09.