diff options
author | Miquel Raynal <miquel.raynal@bootlin.com> | 2019-11-17 18:34:25 +0100 |
---|---|---|
committer | Miquel Raynal <miquel.raynal@bootlin.com> | 2019-11-17 18:34:25 +0100 |
commit | 589e1b6c47ce72fcae103c2e45d899610c92c11e (patch) | |
tree | 125fe159c2800ba70c7bff6b5f0f35e51efb8cdd /drivers/mtd/nand/raw/mxic_nand.c | |
parent | 8389a7b909f252e74ea92b2794de8d660cfee96e (diff) | |
parent | 777260a5c99226cfa58325b6a7c2f39bb46f5aaf (diff) | |
download | linux-589e1b6c47ce72fcae103c2e45d899610c92c11e.tar.bz2 |
Merge tag 'nand/for-5.5' into mtd/next
Raw NAND core
* Useless extra checks dropped.
* Updated the detection of the bad block markers position
Raw NAND controller drivers:
* Cadence : New driver
* Brcmnand: Support for flash-dma v0 + fixes
* Denali : Support for the legacy controller/chip DT representation
dropped
* Superfluous dev_err() calls removed
Diffstat (limited to 'drivers/mtd/nand/raw/mxic_nand.c')
-rw-r--r-- | drivers/mtd/nand/raw/mxic_nand.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mtd/nand/raw/mxic_nand.c b/drivers/mtd/nand/raw/mxic_nand.c index 9d49e6c845e1..ed7a4e021bf5 100644 --- a/drivers/mtd/nand/raw/mxic_nand.c +++ b/drivers/mtd/nand/raw/mxic_nand.c @@ -524,10 +524,8 @@ static int mxic_nfc_probe(struct platform_device *pdev) nand_chip->controller = &nfc->controller; irq = platform_get_irq(pdev, 0); - if (irq < 0) { - dev_err(&pdev->dev, "failed to retrieve irq\n"); + if (irq < 0) return irq; - } mxic_nfc_hw_init(nfc); |