2020-12-09 09:32:53

by Zheng Yongjun

Subject: [PATCH net-next] net: marvell: octeontx2: simplify the otx2_ptp_adjfine()

Simplify the return expression.

Signed-off-by: Zheng Yongjun <[email protected]>
---
drivers/net/ethernet/marvell/octeontx2/nic/otx2_ptp.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ptp.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ptp.c
index 7bcf5246350f..56390a664517 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ptp.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ptp.c
@@ -12,7 +12,6 @@ static int otx2_ptp_adjfine(struct ptp_clock_info *ptp_info, long scaled_ppm)
struct otx2_ptp *ptp = container_of(ptp_info, struct otx2_ptp,
ptp_info);
struct ptp_req *req;
- int err;

if (!ptp->nic)
return -ENODEV;
@@ -24,11 +23,7 @@ static int otx2_ptp_adjfine(struct ptp_clock_info *ptp_info, long scaled_ppm)
req->op = PTP_OP_ADJFINE;
req->scaled_ppm = scaled_ppm;

- err = otx2_sync_mbox_msg(&ptp->nic->mbox);
- if (err)
- return err;
-
- return 0;
+ return otx2_sync_mbox_msg(&ptp->nic->mbox);
}

static u64 ptp_cc_read(const struct cyclecounter *cc)
--
2.22.0

2020-12-10 01:17:55

by David Miller

Subject: Re: [PATCH net-next] net: marvell: octeontx2: simplify the otx2_ptp_adjfine()

From: Zheng Yongjun <[email protected]>
Date: Wed, 9 Dec 2020 17:27:26 +0800

> Simplify the return expression.
>
> Signed-off-by: Zheng Yongjun <[email protected]>

Applied.

2020-12-10 01:18:33

by David Miller

Subject: Re: [PATCH net-next] net: marvell: octeontx2: simplify the otx2_ptp_adjfine()

From: Zheng Yongjun <[email protected]>
Date: Wed, 9 Dec 2020 17:27:26 +0800

> Simplify the return expression.
>
> Signed-off-by: Zheng Yongjun <[email protected]>

Applied.