summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/ndfc.c
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2016-09-28 13:34:58 -0700
committerBrian Norris <computersforpeace@gmail.com>2016-10-03 09:51:35 -0700
commit1e2da4ad2e9b23556630bc774d3b1aaa61c0a69e (patch)
treec886868b46dac770418459eaaa0988504011f2e8 /drivers/mtd/nand/ndfc.c
parent5e149073ba427f99c5e751e558670d034a278f77 (diff)
parentd44154f969a44269a9288c274c1c2fd9e85df8a5 (diff)
downloadop-kernel-dev-1e2da4ad2e9b23556630bc774d3b1aaa61c0a69e.zip
op-kernel-dev-1e2da4ad2e9b23556630bc774d3b1aaa61c0a69e.tar.gz
Merge tag 'for-4.9' of github.com:linux-nand/linux
" Notable core changes: - add the infrastructure to automate NAND timings configuration - provide a generic DT property to maximize ECC strength The rest is just a bunch of minor drivers and core fixes/cleanup patches. " Also not noted: some refactoring in the core bad block table handling, to help with improving some of the logic in error cases. Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd/nand/ndfc.c')
-rw-r--r--drivers/mtd/nand/ndfc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
index 218c789..28e6118 100644
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
@@ -218,8 +218,7 @@ static int ndfc_probe(struct platform_device *ofdev)
ndfc = &ndfc_ctrl[cs];
ndfc->chip_select = cs;
- spin_lock_init(&ndfc->ndfc_control.lock);
- init_waitqueue_head(&ndfc->ndfc_control.wq);
+ nand_hw_control_init(&ndfc->ndfc_control);
ndfc->ofdev = ofdev;
dev_set_drvdata(&ofdev->dev, ndfc);
OpenPOWER on IntegriCloud