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>
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;
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);
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;