lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

spi: atmel-quadspi: void return type for atmel_qspi_init()

Browse Source 
commit 2d30ac5ed6 ("mtd: spi-nor: atmel-quadspi: Use spi-mem interface for atmel-quadspi driver")
removed the error path from atmel_qspi_init(), but not changed the
function's return type. Set void return type for atmel_qspi_init().

Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Tudor Ambarus 2019-06-28 15:30:32 +00:00 committed by Mark Brown
parent 23cdddb21f
commit 5b74e9a306
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/spi/atmel-quadspi.c
View File

@ -405,7 +405,7 @@ static int atmel_qspi_setup(struct spi_device *spi)
return 0; return 0;
} }
static int atmel_qspi_init(struct atmel_qspi *aq) static void atmel_qspi_init(struct atmel_qspi *aq)
{ {
/* Reset the QSPI controller */ /* Reset the QSPI controller */
writel_relaxed(QSPI_CR_SWRST, aq->regs + QSPI_CR); writel_relaxed(QSPI_CR_SWRST, aq->regs + QSPI_CR);
@ -416,8 +416,6 @@ static int atmel_qspi_init(struct atmel_qspi *aq)
/* Enable the QSPI controller */ /* Enable the QSPI controller */
writel_relaxed(QSPI_CR_QSPIEN, aq->regs + QSPI_CR); writel_relaxed(QSPI_CR_QSPIEN, aq->regs + QSPI_CR);
return 0;
} }
static irqreturn_t atmel_qspi_interrupt(int irq, void *dev_id) static irqreturn_t atmel_qspi_interrupt(int irq, void *dev_id)
@ -536,9 +534,7 @@ static int atmel_qspi_probe(struct platform_device *pdev)
if (err) if (err)
goto disable_qspick; goto disable_qspick;
err = atmel_qspi_init(aq); atmel_qspi_init(aq);
if (err)
goto disable_qspick;
err = spi_register_controller(ctrl); err = spi_register_controller(ctrl);
if (err) if (err)
@ -587,7 +583,8 @@ static int __maybe_unused atmel_qspi_resume(struct device *dev)
clk_prepare_enable(aq->pclk); clk_prepare_enable(aq->pclk);
clk_prepare_enable(aq->qspick); clk_prepare_enable(aq->qspick);
return atmel_qspi_init(aq); atmel_qspi_init(aq);
return 0;
} }
static SIMPLE_DEV_PM_OPS(atmel_qspi_pm_ops, atmel_qspi_suspend, static SIMPLE_DEV_PM_OPS(atmel_qspi_pm_ops, atmel_qspi_suspend,