OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[MTD] NAND Initialize controller lock and wq only once 

The lock simplifying patch did not move the lock and waitqueue
initialization into the controller allocation patch.
This reinitializes waitqueue and spinlocks also for driver
supplied controller stuctures. Move it into the allocation path.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner 2006-05-25 09:45:29 +02:00 committed by David Woodhouse
parent 8b9e9fe8c6
commit 04bbd0eafb
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/mtd/nand/nand_base.c
View File

@ -2125,6 +2125,9 @@ static int nand_allocate_kmem(struct mtd_info *mtd, struct nand_chip *chip)
GFP_KERNEL);
if (!chip->controller)
goto outerr;
spin_lock_init(&chip->controller->lock);
init_waitqueue_head(&chip->controller->wq);
chip->options |= NAND_CONTROLLER_ALLOC;
}
return 0;
@ -2451,10 +2454,8 @@ int nand_scan(struct mtd_info *mtd, int maxchips)
BUG();
}
/* Initialize state, waitqueue and spinlock */
/* Initialize state */
chip->state = FL_READY;
init_waitqueue_head(&chip->controller->wq);
spin_lock_init(&chip->controller->lock);
/* De-select the device */
chip->select_chip(mtd, -1);

6
drivers/mtd/nand/ndfc.c
View File

@ -293,8 +293,12 @@ static struct platform_driver ndfc_nand_driver = {
static int __init ndfc_nand_init(void)
{
int ret = platform_driver_register(&ndfc_nand_driver);
int ret;
spin_lock_init(&ndfc_ctrl.ndfc_control.lock);
init_waitqueue_head(&ndfc_ctrl.ndfc_control.wq);
ret = platform_driver_register(&ndfc_nand_driver);
if (!ret)
ret = platform_driver_register(&ndfc_chip_driver);
return ret;