| Message ID | 20240807082918.2558282-2-csokas.bence@prolan.hu (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [resubmit,net,1/2] net: fec: Forward-declare `fec_ptp_read()` | expand |
On Wed, Aug 07, 2024 at 10:29:19AM +0200, Csókás, Bence wrote: > `fec_ptp_pps_perout()` reimplements logic already > in `fec_ptp_read()`. Replace with function call. This is a cleanup, not a fix. So please target net-next, not net. Andrew --- pw-bot: cr
On Wed, Aug 07, 2024 at 10:29:19AM +0200, Csókás, Bence wrote: > `fec_ptp_pps_perout()` reimplements logic already > in `fec_ptp_read()`. Replace with function call. > > Signed-off-by: Csókás, Bence <csokas.bence@prolan.hu> Reviewed-by: Frank Li <Frank.Li@nxp.com> > --- > drivers/net/ethernet/freescale/fec_ptp.c | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c > index fdbf61069a05..91b0804142e4 100644 > --- a/drivers/net/ethernet/freescale/fec_ptp.c > +++ b/drivers/net/ethernet/freescale/fec_ptp.c > @@ -213,13 +213,7 @@ static int fec_ptp_pps_perout(struct fec_enet_private *fep) > timecounter_read(&fep->tc); > > /* Get the current ptp hardware time counter */ > - temp_val = readl(fep->hwp + FEC_ATIME_CTRL); > - temp_val |= FEC_T_CTRL_CAPTURE; > - writel(temp_val, fep->hwp + FEC_ATIME_CTRL); > - if (fep->quirks & FEC_QUIRK_BUG_CAPTURE) > - udelay(1); > - > - ptp_hc = readl(fep->hwp + FEC_ATIME); > + ptp_hc = fec_ptp_read(&fep->cc); > > /* Convert the ptp local counter to 1588 timestamp */ > curr_time = timecounter_cyc2time(&fep->tc, ptp_hc); > -- > 2.34.1 > >
diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c index fdbf61069a05..91b0804142e4 100644 --- a/drivers/net/ethernet/freescale/fec_ptp.c +++ b/drivers/net/ethernet/freescale/fec_ptp.c @@ -213,13 +213,7 @@ static int fec_ptp_pps_perout(struct fec_enet_private *fep) timecounter_read(&fep->tc); /* Get the current ptp hardware time counter */ - temp_val = readl(fep->hwp + FEC_ATIME_CTRL); - temp_val |= FEC_T_CTRL_CAPTURE; - writel(temp_val, fep->hwp + FEC_ATIME_CTRL); - if (fep->quirks & FEC_QUIRK_BUG_CAPTURE) - udelay(1); - - ptp_hc = readl(fep->hwp + FEC_ATIME); + ptp_hc = fec_ptp_read(&fep->cc); /* Convert the ptp local counter to 1588 timestamp */ curr_time = timecounter_cyc2time(&fep->tc, ptp_hc);
`fec_ptp_pps_perout()` reimplements logic already in `fec_ptp_read()`. Replace with function call. Signed-off-by: Csókás, Bence <csokas.bence@prolan.hu> --- drivers/net/ethernet/freescale/fec_ptp.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)