From: Marc Kleine-Budde <mkl@pengutronix.de>
To: "Csókás Bence" <Csokas.Bence@prolan.hu>
Cc: "Bence Csókás" <bence98@sch.bme.hu>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"Richard Cochran" <richardcochran@gmail.com>,
"David S . Miller" <davem@davemloft.net>,
"Jakub Kicinski" <kuba@kernel.org>,
"Francesco Dolcini" <francesco.dolcini@toradex.com>,
"Andrew Lunn" <andrew@lunn.ch>,
"Guenter Roeck" <linux@roeck-us.net>,
"kernel@pengutronix.de" <kernel@pengutronix.de>
Subject: Re: [PATCH 1/2] Revert "net: fec: Use a spinlock to guard `fep->ptp_clk_on`"
Date: Wed, 14 Sep 2022 10:38:11 +0200 [thread overview]
Message-ID: <20220914083811.rjb2epj5icgvo62y@pengutronix.de> (raw)
In-Reply-To: <3f2824bc776f4383b84e4137f6c740de@prolan.hu>
[-- Attachment #1: Type: text/plain, Size: 1772 bytes --]
On 13.09.2022 19:04:56, Csókás Bence wrote:
> > This is not a 100% revert.
> >
> > In b353b241f1eb ("net: fec: Use a spinlock to guard `fep->ptp_clk_on`")
> > the "struct fec_enet_private *fep" was renamed to "struct
> > fec_enet_private *adapter" for no apparent reason. The driver uses "fep"
> > everywhere else. This revert doesn't restore the original state.
>
> You got that backwards. b353b241f1eb renamed `adapter` to `fep` to align
> it with the rest of the driver.
Doh! You're right - sorry about that.
> I decided to amend the revert to keep this renaming.
> `adapter` was introduced in 6605b73 when `fec_ptp.c` was created.
>
> > This leads to the following diff against a 100% revert.
> >
> > diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c
> > index c99dff3c3422..c74d04f4b2fd 100644
> > --- a/drivers/net/ethernet/freescale/fec_ptp.c
> > +++ b/drivers/net/ethernet/freescale/fec_ptp.c
> > @@ -365,21 +365,21 @@ static int fec_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
> > */
> > static int fec_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
> > {
> > - struct fec_enet_private *fep =
> > + struct fec_enet_private *adapter =
>
> Here you can clearly see the nature of my amend.
Please don't mix fixes and especially reverts with cleanups.
> I thought I added this to the commit message,
> but it seems I have forgot.
regards,
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung West/Dortmund | Phone: +49-231-2826-924 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2022-09-14 8:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-12 7:31 [PATCH 1/2] Revert "net: fec: Use a spinlock to guard `fep->ptp_clk_on`" Bence Csókás
2022-09-12 7:31 ` [PATCH 2/2] net: fec: Use unlocked timecounter reads for saving state Bence Csókás
2022-09-12 7:31 ` [PATCH v3 " Bence Csókás
2022-09-12 7:09 ` Csókás Bence
2022-09-12 10:38 ` [PATCH 1/2] Revert "net: fec: Use a spinlock to guard `fep->ptp_clk_on`" Marc Kleine-Budde
2022-09-12 12:38 ` Marc Kleine-Budde
2022-09-13 19:04 ` Csókás Bence
2022-09-14 8:38 ` Marc Kleine-Budde [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220914083811.rjb2epj5icgvo62y@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=Csokas.Bence@prolan.hu \
--cc=andrew@lunn.ch \
--cc=bence98@sch.bme.hu \
--cc=davem@davemloft.net \
--cc=francesco.dolcini@toradex.com \
--cc=kernel@pengutronix.de \
--cc=kuba@kernel.org \
--cc=linux@roeck-us.net \
--cc=netdev@vger.kernel.org \
--cc=richardcochran@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).