Messages in this thread | | | Date | Tue, 5 May 2020 06:49:07 -0500 | From | Corey Minyard <> | Subject | Re: [PATCH v3] ipmi:bt-bmc: Fix error handling and status check |
| |
On Tue, May 05, 2020 at 06:29:06PM +0800, Tang Bin wrote: > If the function platform_get_irq() failed, the negative value > returned will not be detected here. So fix error handling in > bt_bmc_config_irq(). And in the function bt_bmc_probe(), > when get irq failed, it will print error message. So use > platform_get_irq_optional() to simplify code. Finally in the > function bt_bmc_remove() should make the right status check > if get irq failed.
Ok, this is included in my tree.
Thanks,
-corey
> > Signed-off-by: Shengju Zhang <zhangshengju@cmss.chinamobile.com> > Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com> > --- > Changes from v2 > - fix the commit message and the code of status check > Changes from v1 > - fix the code of status check > --- > drivers/char/ipmi/bt-bmc.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/char/ipmi/bt-bmc.c b/drivers/char/ipmi/bt-bmc.c > index d36aeacb2..88ee54767 100644 > --- a/drivers/char/ipmi/bt-bmc.c > +++ b/drivers/char/ipmi/bt-bmc.c > @@ -399,9 +399,9 @@ static int bt_bmc_config_irq(struct bt_bmc *bt_bmc, > struct device *dev = &pdev->dev; > int rc; > > - bt_bmc->irq = platform_get_irq(pdev, 0); > - if (!bt_bmc->irq) > - return -ENODEV; > + bt_bmc->irq = platform_get_irq_optional(pdev, 0); > + if (bt_bmc->irq < 0) > + return bt_bmc->irq; > > rc = devm_request_irq(dev, bt_bmc->irq, bt_bmc_irq, IRQF_SHARED, > DEVICE_NAME, bt_bmc); > @@ -477,7 +477,7 @@ static int bt_bmc_probe(struct platform_device *pdev) > > bt_bmc_config_irq(bt_bmc, pdev); > > - if (bt_bmc->irq) { > + if (bt_bmc->irq >= 0) { > dev_info(dev, "Using IRQ %d\n", bt_bmc->irq); > } else { > dev_info(dev, "No IRQ; using timer\n"); > @@ -503,7 +503,7 @@ static int bt_bmc_remove(struct platform_device *pdev) > struct bt_bmc *bt_bmc = dev_get_drvdata(&pdev->dev); > > misc_deregister(&bt_bmc->miscdev); > - if (!bt_bmc->irq) > + if (bt_bmc->irq < 0) > del_timer_sync(&bt_bmc->poll_timer); > return 0; > } > -- > 2.20.1.windows.1 > > >
| |