* [PATCH net-next] net: aquantia: fix return value check in aq_ptp_init()
@ 2019-11-06 14:59 ` Wei Yongjun
0 siblings, 0 replies; 6+ messages in thread
From: Wei Yongjun @ 2019-11-06 14:59 UTC (permalink / raw)
To: Egor Pomozov, Igor Russkikh; +Cc: Wei Yongjun, netdev, kernel-janitors
Function ptp_clock_register() returns ERR_PTR() and never returns
NULL. The NULL test should be removed.
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
drivers/net/ethernet/aquantia/atlantic/aq_ptp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c b/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c
index 3ec08415e53e..252a80b6d3b6 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c
@@ -1205,7 +1205,7 @@ int aq_ptp_init(struct aq_nic_s *aq_nic, unsigned int idx_vec)
aq_ptp->ptp_info = aq_ptp_clock;
aq_ptp_gpio_init(&aq_ptp->ptp_info, &mbox.info);
clock = ptp_clock_register(&aq_ptp->ptp_info, &aq_nic->ndev->dev);
- if (!clock || IS_ERR(clock)) {
+ if (IS_ERR(clock)) {
netdev_err(aq_nic->ndev, "ptp_clock_register failed\n");
err = PTR_ERR(clock);
goto err_exit;
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH net-next] net: aquantia: fix return value check in aq_ptp_init()
@ 2019-11-06 14:59 ` Wei Yongjun
0 siblings, 0 replies; 6+ messages in thread
From: Wei Yongjun @ 2019-11-06 14:59 UTC (permalink / raw)
To: Egor Pomozov, Igor Russkikh; +Cc: Wei Yongjun, netdev, kernel-janitors
Function ptp_clock_register() returns ERR_PTR() and never returns
NULL. The NULL test should be removed.
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
drivers/net/ethernet/aquantia/atlantic/aq_ptp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c b/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c
index 3ec08415e53e..252a80b6d3b6 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c
@@ -1205,7 +1205,7 @@ int aq_ptp_init(struct aq_nic_s *aq_nic, unsigned int idx_vec)
aq_ptp->ptp_info = aq_ptp_clock;
aq_ptp_gpio_init(&aq_ptp->ptp_info, &mbox.info);
clock = ptp_clock_register(&aq_ptp->ptp_info, &aq_nic->ndev->dev);
- if (!clock || IS_ERR(clock)) {
+ if (IS_ERR(clock)) {
netdev_err(aq_nic->ndev, "ptp_clock_register failed\n");
err = PTR_ERR(clock);
goto err_exit;
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [EXT] [PATCH net-next] net: aquantia: fix return value check in aq_ptp_init()
2019-11-06 14:59 ` Wei Yongjun
@ 2019-11-07 0:00 ` Igor Russkikh
-1 siblings, 0 replies; 6+ messages in thread
From: Igor Russkikh @ 2019-11-07 0:00 UTC (permalink / raw)
To: Wei Yongjun, Egor Pomozov, Igor Russkikh; +Cc: netdev, kernel-janitors
> Function ptp_clock_register() returns ERR_PTR() and never returns
> NULL. The NULL test should be removed.
Thanks, Wei!
Function by itself could return null, but you are right, since this
code is now active only when PTP_1588_CLOCK is on - this is a useless check then.
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
> ---
> drivers/net/ethernet/aquantia/atlantic/aq_ptp.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c b/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c
> index 3ec08415e53e..252a80b6d3b6 100644
> --- a/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c
> +++ b/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c
> @@ -1205,7 +1205,7 @@ int aq_ptp_init(struct aq_nic_s *aq_nic, unsigned int idx_vec)
> aq_ptp->ptp_info = aq_ptp_clock;
> aq_ptp_gpio_init(&aq_ptp->ptp_info, &mbox.info);
> clock = ptp_clock_register(&aq_ptp->ptp_info, &aq_nic->ndev->dev);
> - if (!clock || IS_ERR(clock)) {
> + if (IS_ERR(clock)) {
> netdev_err(aq_nic->ndev, "ptp_clock_register failed\n");
> err = PTR_ERR(clock);
> goto err_exit;
Acked-by: Igor Russkikh <irusskikh@marvell.com>
--
Regards,
Igor
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [EXT] [PATCH net-next] net: aquantia: fix return value check in aq_ptp_init()
@ 2019-11-07 0:00 ` Igor Russkikh
0 siblings, 0 replies; 6+ messages in thread
From: Igor Russkikh @ 2019-11-07 0:00 UTC (permalink / raw)
To: Wei Yongjun, Egor Pomozov, Igor Russkikh; +Cc: netdev, kernel-janitors
DQo+IEZ1bmN0aW9uIHB0cF9jbG9ja19yZWdpc3RlcigpIHJldHVybnMgRVJSX1BUUigpIGFuZCBu
ZXZlciByZXR1cm5zDQo+IE5VTEwuIFRoZSBOVUxMIHRlc3Qgc2hvdWxkIGJlIHJlbW92ZWQuDQoN
ClRoYW5rcywgV2VpIQ0KDQpGdW5jdGlvbiBieSBpdHNlbGYgY291bGQgcmV0dXJuIG51bGwsIGJ1
dCB5b3UgYXJlIHJpZ2h0LCBzaW5jZSB0aGlzDQpjb2RlIGlzIG5vdyBhY3RpdmUgb25seSB3aGVu
IFBUUF8xNTg4X0NMT0NLIGlzIG9uIC0gdGhpcyBpcyBhIHVzZWxlc3MgY2hlY2sgdGhlbi4NCg0K
PiBTaWduZWQtb2ZmLWJ5OiBXZWkgWW9uZ2p1biA8d2VpeW9uZ2p1bjFAaHVhd2VpLmNvbT4NCj4g
LS0tDQo+ICBkcml2ZXJzL25ldC9ldGhlcm5ldC9hcXVhbnRpYS9hdGxhbnRpYy9hcV9wdHAuYyB8
IDIgKy0NCj4gIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBkZWxldGlvbigtKQ0K
PiANCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0L2V0aGVybmV0L2FxdWFudGlhL2F0bGFudGlj
L2FxX3B0cC5jIGIvZHJpdmVycy9uZXQvZXRoZXJuZXQvYXF1YW50aWEvYXRsYW50aWMvYXFfcHRw
LmMNCj4gaW5kZXggM2VjMDg0MTVlNTNlLi4yNTJhODBiNmQzYjYgMTAwNjQ0DQo+IC0tLSBhL2Ry
aXZlcnMvbmV0L2V0aGVybmV0L2FxdWFudGlhL2F0bGFudGljL2FxX3B0cC5jDQo+ICsrKyBiL2Ry
aXZlcnMvbmV0L2V0aGVybmV0L2FxdWFudGlhL2F0bGFudGljL2FxX3B0cC5jDQo+IEBAIC0xMjA1
LDcgKzEyMDUsNyBAQCBpbnQgYXFfcHRwX2luaXQoc3RydWN0IGFxX25pY19zICphcV9uaWMsIHVu
c2lnbmVkIGludCBpZHhfdmVjKQ0KPiAgCWFxX3B0cC0+cHRwX2luZm8gPSBhcV9wdHBfY2xvY2s7
DQo+ICAJYXFfcHRwX2dwaW9faW5pdCgmYXFfcHRwLT5wdHBfaW5mbywgJm1ib3guaW5mbyk7DQo+
ICAJY2xvY2sgPSBwdHBfY2xvY2tfcmVnaXN0ZXIoJmFxX3B0cC0+cHRwX2luZm8sICZhcV9uaWMt
Pm5kZXYtPmRldik7DQo+IC0JaWYgKCFjbG9jayB8fCBJU19FUlIoY2xvY2spKSB7DQo+ICsJaWYg
KElTX0VSUihjbG9jaykpIHsNCj4gIAkJbmV0ZGV2X2VycihhcV9uaWMtPm5kZXYsICJwdHBfY2xv
Y2tfcmVnaXN0ZXIgZmFpbGVkXG4iKTsNCj4gIAkJZXJyID0gUFRSX0VSUihjbG9jayk7DQo+ICAJ
CWdvdG8gZXJyX2V4aXQ7DQoNCkFja2VkLWJ5OiBJZ29yIFJ1c3NraWtoIDxpcnVzc2tpa2hAbWFy
dmVsbC5jb20+DQoNCi0tIA0KUmVnYXJkcywNCiAgSWdvcg0K
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] net: aquantia: fix return value check in aq_ptp_init()
2019-11-06 14:59 ` Wei Yongjun
@ 2019-11-07 5:22 ` David Miller
-1 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2019-11-07 5:22 UTC (permalink / raw)
To: weiyongjun1; +Cc: epomozov, igor.russkikh, netdev, kernel-janitors
From: Wei Yongjun <weiyongjun1@huawei.com>
Date: Wed, 6 Nov 2019 14:59:21 +0000
> Function ptp_clock_register() returns ERR_PTR() and never returns
> NULL. The NULL test should be removed.
>
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] net: aquantia: fix return value check in aq_ptp_init()
@ 2019-11-07 5:22 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2019-11-07 5:22 UTC (permalink / raw)
To: weiyongjun1; +Cc: epomozov, igor.russkikh, netdev, kernel-janitors
From: Wei Yongjun <weiyongjun1@huawei.com>
Date: Wed, 6 Nov 2019 14:59:21 +0000
> Function ptp_clock_register() returns ERR_PTR() and never returns
> NULL. The NULL test should be removed.
>
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-11-07 5:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-06 14:59 [PATCH net-next] net: aquantia: fix return value check in aq_ptp_init() Wei Yongjun
2019-11-06 14:59 ` Wei Yongjun
2019-11-07 0:00 ` [EXT] " Igor Russkikh
2019-11-07 0:00 ` Igor Russkikh
2019-11-07 5:22 ` David Miller
2019-11-07 5:22 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.