spi: s3c24xx: Switch to use devm_spi_alloc_master()
Subsystems (3)
PATCH v2 1/1 spi: s3c24xx: Switch to use devm_spi_alloc_master()
Switch to use devm_spi_alloc_master() to simpify error path.
---
v2:
Don't remove error label err_register.
--- drivers/spi/spi-s3c24xx.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-)
drivers/spi/spi-s3c24xx.c +8 -16
@@ -449,7 +449,7 @@ static int s3c24xx_spi_probe(struct platform_device *pdev)struct spi_master *master;int err =0 ; - master =spi_alloc_master (&pdev->dev,sizeof (struct s3c24xx_spi )); + master =devm_spi_alloc_master (&pdev->dev,sizeof (struct s3c24xx_spi ));if (master ==NULL ) {dev_err (&pdev->dev,"No memory for spi_master\n" );return -ENOMEM ;
@@ -463,8 +463,7 @@ static int s3c24xx_spi_probe(struct platform_device *pdev)if (pdata ==NULL ) {dev_err (&pdev->dev,"No platform data supplied\n" ); - err = -ENOENT ; - goto err_no_pdata; +return -ENOENT ; }platform_set_drvdata (pdev, hw);
@@ -499,29 +498,24 @@ static int s3c24xx_spi_probe(struct platform_device *pdev)/* find and map our resources */ hw->regs =devm_platform_ioremap_resource (pdev,0 ); -if (IS_ERR (hw->regs)) { - err =PTR_ERR (hw->regs); - goto err_no_pdata; - } +if (IS_ERR (hw->regs)) +return PTR_ERR (hw->regs); hw->irq =platform_get_irq (pdev,0 ); -if (hw->irq <0 ) { - err = -ENOENT ; - goto err_no_pdata; - } +if (hw->irq <0 ) +return -ENOENT ; err =devm_request_irq (&pdev->dev, hw->irq, s3c24xx_spi_irq,0 , pdev->name, hw);if (err) {dev_err (&pdev->dev,"Cannot claim IRQ\n" ); - goto err_no_pdata; +return err; } hw->clk =devm_clk_get (&pdev->dev,"spi" );if (IS_ERR (hw->clk)) {dev_err (&pdev->dev,"No clock for device\n" ); - err =PTR_ERR (hw->clk); - goto err_no_pdata; +return PTR_ERR (hw->clk); }s3c24xx_spi_initialsetup (hw);
@@ -539,8 +533,6 @@ static int s3c24xx_spi_probe(struct platform_device *pdev) err_register:clk_disable (hw->clk); - err_no_pdata: -spi_master_put (hw->master);return err; }
Signature · 1 line
2.25.1
Quoted 3 lines · Yang Yingliang
Switch to use
devm_spi_alloc_master()to simpify error path.Signed-off-by Yang Yingliang <[email protected]>
Best regards,
Krzysztof
Mark Brown
maintainerQuoted 3 lines · Yang Yingliang
Switch to use
devm_spi_alloc_master()to simpify error path.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next
Thanks!
[1/1] spi: s3c24xx: Switch to use devm_spi_alloc_master()
commit: a6bfc42f30d11f22d2dacb2362d6069643b15393
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark