| Message ID | 20230728075729.3451867-1-chenjiahao16@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 71ee2a4f95e205bd33e79c7bd4bece3885e0e366 |
| Headers | show |
| Series | [-next,v2] spi: microchip-core: Clean up redundant dev_err_probe() | expand |
On Fri, Jul 28, 2023 at 03:57:29PM +0800, Chen Jiahao wrote: > Refering to platform_get_irq()'s definition, the return value has > already been checked if ret < 0, and printed via dev_err_probe(). > Calling dev_err_probe() one more time outside platform_get_irq() > is obviously redundant. > > Furthermore, platform_get_irq() will never return irq equals 0, > removing spi->irq == 0 checking to clean it up. > > Signed-off-by: Chen Jiahao <chenjiahao16@huawei.com> > --- > drivers/spi/spi-microchip-core.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/spi/spi-microchip-core.c b/drivers/spi/spi-microchip-core.c > index b59e8a0c5b97..b451cd4860ec 100644 > --- a/drivers/spi/spi-microchip-core.c > +++ b/drivers/spi/spi-microchip-core.c > @@ -530,10 +530,8 @@ static int mchp_corespi_probe(struct platform_device *pdev) > return PTR_ERR(spi->regs); > > spi->irq = platform_get_irq(pdev, 0); > - if (spi->irq <= 0) > - return dev_err_probe(&pdev->dev, -ENXIO, > - "invalid IRQ %d for SPI controller\n", > - spi->irq); > + if (spi->irq < 0) > + return spi->irq; Thanks for the update, looks fine to me. Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Thanks, Conor. > > ret = devm_request_irq(&pdev->dev, spi->irq, mchp_corespi_interrupt, > IRQF_SHARED, dev_name(&pdev->dev), master); > -- > 2.34.1 >
On Fri, 28 Jul 2023 15:57:29 +0800, Chen Jiahao wrote: > Refering to platform_get_irq()'s definition, the return value has > already been checked if ret < 0, and printed via dev_err_probe(). > Calling dev_err_probe() one more time outside platform_get_irq() > is obviously redundant. > > Furthermore, platform_get_irq() will never return irq equals 0, > removing spi->irq == 0 checking to clean it up. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/1] spi: microchip-core: Clean up redundant dev_err_probe() commit: 71ee2a4f95e205bd33e79c7bd4bece3885e0e366 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-microchip-core.c b/drivers/spi/spi-microchip-core.c index b59e8a0c5b97..b451cd4860ec 100644 --- a/drivers/spi/spi-microchip-core.c +++ b/drivers/spi/spi-microchip-core.c @@ -530,10 +530,8 @@ static int mchp_corespi_probe(struct platform_device *pdev) return PTR_ERR(spi->regs); spi->irq = platform_get_irq(pdev, 0); - if (spi->irq <= 0) - return dev_err_probe(&pdev->dev, -ENXIO, - "invalid IRQ %d for SPI controller\n", - spi->irq); + if (spi->irq < 0) + return spi->irq; ret = devm_request_irq(&pdev->dev, spi->irq, mchp_corespi_interrupt, IRQF_SHARED, dev_name(&pdev->dev), master);
Refering to platform_get_irq()'s definition, the return value has already been checked if ret < 0, and printed via dev_err_probe(). Calling dev_err_probe() one more time outside platform_get_irq() is obviously redundant. Furthermore, platform_get_irq() will never return irq equals 0, removing spi->irq == 0 checking to clean it up. Signed-off-by: Chen Jiahao <chenjiahao16@huawei.com> --- drivers/spi/spi-microchip-core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)