| Message ID | 20220920114448.2681053-1-yangyingliang@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 478cc2fc3dd782f7935bc0ab84c198691ea83fa3 |
| Headers | show |
| Series | [-next] spi: xtensa-xtfpga: Switch to use devm_spi_alloc_master() | expand |
On Tue, Sep 20, 2022 at 4:37 AM Yang Yingliang <yangyingliang@huawei.com> wrote: > > Switch to use devm_spi_alloc_master() to simpify error path. Typo: simplify. > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> > --- > drivers/spi/spi-xtensa-xtfpga.c | 16 +++++----------- > 1 file changed, 5 insertions(+), 11 deletions(-) > > diff --git a/drivers/spi/spi-xtensa-xtfpga.c b/drivers/spi/spi-xtensa-xtfpga.c > index fc2b5eb7d614..2fa7608f94cd 100644 > --- a/drivers/spi/spi-xtensa-xtfpga.c > +++ b/drivers/spi/spi-xtensa-xtfpga.c > @@ -83,7 +83,7 @@ static int xtfpga_spi_probe(struct platform_device *pdev) > int ret; > struct spi_master *master; > > - master = spi_alloc_master(&pdev->dev, sizeof(struct xtfpga_spi)); > + master = devm_spi_alloc_master(&pdev->dev, sizeof(struct xtfpga_spi)); > if (!master) > return -ENOMEM; > > @@ -97,30 +97,24 @@ static int xtfpga_spi_probe(struct platform_device *pdev) > xspi->bitbang.chipselect = xtfpga_spi_chipselect; > xspi->bitbang.txrx_word[SPI_MODE_0] = xtfpga_spi_txrx_word; > xspi->regs = devm_platform_ioremap_resource(pdev, 0); > - if (IS_ERR(xspi->regs)) { > - ret = PTR_ERR(xspi->regs); > - goto err; > - } > + if (IS_ERR(xspi->regs)) > + return PTR_ERR(xspi->regs); > > xtfpga_spi_write32(xspi, XTFPGA_SPI_START, 0); > usleep_range(1000, 2000); > if (xtfpga_spi_read32(xspi, XTFPGA_SPI_BUSY)) { > dev_err(&pdev->dev, "Device stuck in busy state\n"); > - ret = -EBUSY; > - goto err; > + return -EBUSY; > } > > ret = spi_bitbang_start(&xspi->bitbang); > if (ret < 0) { > dev_err(&pdev->dev, "spi_bitbang_start failed\n"); > - goto err; > + return ret; > } > > platform_set_drvdata(pdev, master); > return 0; > -err: > - spi_master_put(master); > - return ret; > } > > static int xtfpga_spi_remove(struct platform_device *pdev) There's a call to spi_master_put in the xtfpga_spi_remove, IIUC this call must be dropped too.
Hi, On 2022/9/21 11:53, Max Filippov wrote: > On Tue, Sep 20, 2022 at 4:37 AM Yang Yingliang <yangyingliang@huawei.com> wrote: >> Switch to use devm_spi_alloc_master() to simpify error path. > Typo: simplify. OK, will fix it in v2. > >> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> >> --- >> drivers/spi/spi-xtensa-xtfpga.c | 16 +++++----------- >> 1 file changed, 5 insertions(+), 11 deletions(-) >> >> diff --git a/drivers/spi/spi-xtensa-xtfpga.c b/drivers/spi/spi-xtensa-xtfpga.c >> index fc2b5eb7d614..2fa7608f94cd 100644 >> --- a/drivers/spi/spi-xtensa-xtfpga.c >> +++ b/drivers/spi/spi-xtensa-xtfpga.c >> @@ -83,7 +83,7 @@ static int xtfpga_spi_probe(struct platform_device *pdev) >> int ret; >> struct spi_master *master; >> >> - master = spi_alloc_master(&pdev->dev, sizeof(struct xtfpga_spi)); >> + master = devm_spi_alloc_master(&pdev->dev, sizeof(struct xtfpga_spi)); >> if (!master) >> return -ENOMEM; >> >> @@ -97,30 +97,24 @@ static int xtfpga_spi_probe(struct platform_device *pdev) >> xspi->bitbang.chipselect = xtfpga_spi_chipselect; >> xspi->bitbang.txrx_word[SPI_MODE_0] = xtfpga_spi_txrx_word; >> xspi->regs = devm_platform_ioremap_resource(pdev, 0); >> - if (IS_ERR(xspi->regs)) { >> - ret = PTR_ERR(xspi->regs); >> - goto err; >> - } >> + if (IS_ERR(xspi->regs)) >> + return PTR_ERR(xspi->regs); >> >> xtfpga_spi_write32(xspi, XTFPGA_SPI_START, 0); >> usleep_range(1000, 2000); >> if (xtfpga_spi_read32(xspi, XTFPGA_SPI_BUSY)) { >> dev_err(&pdev->dev, "Device stuck in busy state\n"); >> - ret = -EBUSY; >> - goto err; >> + return -EBUSY; >> } >> >> ret = spi_bitbang_start(&xspi->bitbang); >> if (ret < 0) { >> dev_err(&pdev->dev, "spi_bitbang_start failed\n"); >> - goto err; >> + return ret; >> } >> >> platform_set_drvdata(pdev, master); >> return 0; >> -err: >> - spi_master_put(master); >> - return ret; >> } >> >> static int xtfpga_spi_remove(struct platform_device *pdev) > There's a call to spi_master_put in the xtfpga_spi_remove, > IIUC this call must be dropped too. It can not be dropped, the controller is get in spi_bitbang_start(), it need be put in remove(). Thanks, Yang >
On Tue, Sep 20, 2022 at 11:18 PM Yang Yingliang <yangyingliang@huawei.com> wrote: > On 2022/9/21 11:53, Max Filippov wrote: > > On Tue, Sep 20, 2022 at 4:37 AM Yang Yingliang <yangyingliang@huawei.com> wrote: > >> static int xtfpga_spi_remove(struct platform_device *pdev) > > There's a call to spi_master_put in the xtfpga_spi_remove, > > IIUC this call must be dropped too. > It can not be dropped, the controller is get in spi_bitbang_start(), it > need be put in remove(). Oh, I see, spi_bitbang_stop doesn't do it for controllers allocated with devres. Tested-by: Max Filippov <jcmvbkbc@gmail.com> Acked-by: Max Filippov <jcmvbkbc@gmail.com>
On Tue, 20 Sep 2022 19:44:48 +0800, Yang Yingliang wrote: > Switch to use devm_spi_alloc_master() to simpify error path. > > Applied to broonie/spi.git for-next Thanks! [1/1] spi: xtensa-xtfpga: Switch to use devm_spi_alloc_master() commit: 478cc2fc3dd782f7935bc0ab84c198691ea83fa3 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
diff --git a/drivers/spi/spi-xtensa-xtfpga.c b/drivers/spi/spi-xtensa-xtfpga.c index fc2b5eb7d614..2fa7608f94cd 100644 --- a/drivers/spi/spi-xtensa-xtfpga.c +++ b/drivers/spi/spi-xtensa-xtfpga.c @@ -83,7 +83,7 @@ static int xtfpga_spi_probe(struct platform_device *pdev) int ret; struct spi_master *master; - master = spi_alloc_master(&pdev->dev, sizeof(struct xtfpga_spi)); + master = devm_spi_alloc_master(&pdev->dev, sizeof(struct xtfpga_spi)); if (!master) return -ENOMEM; @@ -97,30 +97,24 @@ static int xtfpga_spi_probe(struct platform_device *pdev) xspi->bitbang.chipselect = xtfpga_spi_chipselect; xspi->bitbang.txrx_word[SPI_MODE_0] = xtfpga_spi_txrx_word; xspi->regs = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(xspi->regs)) { - ret = PTR_ERR(xspi->regs); - goto err; - } + if (IS_ERR(xspi->regs)) + return PTR_ERR(xspi->regs); xtfpga_spi_write32(xspi, XTFPGA_SPI_START, 0); usleep_range(1000, 2000); if (xtfpga_spi_read32(xspi, XTFPGA_SPI_BUSY)) { dev_err(&pdev->dev, "Device stuck in busy state\n"); - ret = -EBUSY; - goto err; + return -EBUSY; } ret = spi_bitbang_start(&xspi->bitbang); if (ret < 0) { dev_err(&pdev->dev, "spi_bitbang_start failed\n"); - goto err; + return ret; } platform_set_drvdata(pdev, master); return 0; -err: - spi_master_put(master); - return ret; } static int xtfpga_spi_remove(struct platform_device *pdev)
Switch to use devm_spi_alloc_master() to simpify error path. Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- drivers/spi/spi-xtensa-xtfpga.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)