Message ID | 20211126013130.27112-1-samirweng1979@163.com (mailing list archive) |
---|---|
State | Accepted |
Commit | af22d0550705dcb4142362b232f972bfab486b89 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | nfc: fdp: Merge the same judgment | expand |
On 26/11/2021 02:31, samirweng1979 wrote: > From: wengjianfeng <wengjianfeng@yulong.com> > > Combine two judgments that return the same value > > Signed-off-by: wengjianfeng <wengjianfeng@yulong.com> > --- > drivers/nfc/fdp/i2c.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Best regards, Krzysztof
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Fri, 26 Nov 2021 09:31:30 +0800 you wrote: > From: wengjianfeng <wengjianfeng@yulong.com> > > Combine two judgments that return the same value > > Signed-off-by: wengjianfeng <wengjianfeng@yulong.com> > --- > drivers/nfc/fdp/i2c.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) Here is the summary with links: - nfc: fdp: Merge the same judgment https://git.kernel.org/netdev/net-next/c/af22d0550705 You are awesome, thank you!
diff --git a/drivers/nfc/fdp/i2c.c b/drivers/nfc/fdp/i2c.c index f78670bf41e0..28a9e1eb9bcf 100644 --- a/drivers/nfc/fdp/i2c.c +++ b/drivers/nfc/fdp/i2c.c @@ -205,9 +205,7 @@ static irqreturn_t fdp_nci_i2c_irq_thread_fn(int irq, void *phy_id) r = fdp_nci_i2c_read(phy, &skb); - if (r == -EREMOTEIO) - return IRQ_HANDLED; - else if (r == -ENOMEM || r == -EBADMSG) + if (r == -EREMOTEIO || r == -ENOMEM || r == -EBADMSG) return IRQ_HANDLED; if (skb != NULL)