Merge tag '4.9/mtd-pairing-scheme' of github.com:linux-nand/linux

[cascardo/linux.git] / drivers / mtd / nand / txx9ndfmc.c

diff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/txx9ndfmc.c
index 04d63f5..0a14fda 100644 (file)
--- a/drivers/mtd/nand/txx9ndfmc.c
+++ b/drivers/mtd/nand/txx9ndfmc.c
@@ -303,8 +303,7 @@ static int __init txx9ndfmc_probe(struct platform_device *dev)
        dev_info(&dev->dev, "CLK:%ldMHz HOLD:%d SPW:%d\n",
                 (gbusclk + 500000) / 1000000, hold, spw);
 
-       spin_lock_init(&drvdata->hw_control.lock);
-       init_waitqueue_head(&drvdata->hw_control.wq);
+       nand_hw_control_init(&drvdata->hw_control);
 
        platform_set_drvdata(dev, drvdata);
        txx9ndfmc_initialize(dev);