| Message ID | 20241016-fec-cleanups-v1-4-de783bd15e6a@pengutronix.de (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | net: fec: cleanups, update quirk, update IRQ naming | expand |
> -----Original Message----- > From: Marc Kleine-Budde <mkl@pengutronix.de> > Sent: 2024年10月17日 5:52 > To: Wei Fang <wei.fang@nxp.com>; Shenwei Wang <shenwei.wang@nxp.com>; > Clark Wang <xiaoning.wang@nxp.com>; David S. Miller > <davem@davemloft.net>; Eric Dumazet <edumazet@google.com>; Jakub > Kicinski <kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com>; Richard > Cochran <richardcochran@gmail.com> > Cc: imx@lists.linux.dev; netdev@vger.kernel.org; linux-kernel@vger.kernel.org; > kernel@pengutronix.de; Marc Kleine-Budde <mkl@pengutronix.de> > Subject: [PATCH net-next 04/13] net: fec: rename struct fec_devinfo > fec_imx6x_info -> fec_imx6sx_info > > In da722186f654 ("net: fec: set GPR bit on suspend by DT > configuration.") the platform_device_id fec_devtype::driver_data was > converted from holding the quirks to a pointing to struct fec_devinfo. > > The struct fec_devinfo holding the information for the i.MX6SX was > named fec_imx6x_info. > > To align the name of the struct with the SoC's name, rename struct > fec_devinfo fec_imx6x_info to struct fec_devinfo fec_imx6sx_info. > > Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> > --- > drivers/net/ethernet/freescale/fec_main.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/freescale/fec_main.c > b/drivers/net/ethernet/freescale/fec_main.c > index > 1b55047c0237cbea4e44a5a8335af5c11e2325f8..c57039cc83228dcd980a8fd > bc18cd3eab2dfe1a5 100644 > --- a/drivers/net/ethernet/freescale/fec_main.c > +++ b/drivers/net/ethernet/freescale/fec_main.c > @@ -131,7 +131,7 @@ static const struct fec_devinfo fec_mvf600_info = { > FEC_QUIRK_HAS_MDIO_C45, > }; > > -static const struct fec_devinfo fec_imx6x_info = { > +static const struct fec_devinfo fec_imx6sx_info = { > .quirks = FEC_QUIRK_ENET_MAC | FEC_QUIRK_HAS_GBIT | > FEC_QUIRK_HAS_BUFDESC_EX | FEC_QUIRK_HAS_CSUM | > FEC_QUIRK_HAS_VLAN | FEC_QUIRK_HAS_AVB | > @@ -196,7 +196,7 @@ static const struct of_device_id fec_dt_ids[] = { > { .compatible = "fsl,imx28-fec", .data = &fec_imx28_info, }, > { .compatible = "fsl,imx6q-fec", .data = &fec_imx6q_info, }, > { .compatible = "fsl,mvf600-fec", .data = &fec_mvf600_info, }, > - { .compatible = "fsl,imx6sx-fec", .data = &fec_imx6x_info, }, > + { .compatible = "fsl,imx6sx-fec", .data = &fec_imx6sx_info, }, > { .compatible = "fsl,imx6ul-fec", .data = &fec_imx6ul_info, }, > { .compatible = "fsl,imx8mq-fec", .data = &fec_imx8mq_info, }, > { .compatible = "fsl,imx8qm-fec", .data = &fec_imx8qm_info, }, > > -- > 2.45.2 > Thanks. Reviewed-by: Wei Fang <wei.fang@nxp.com>
On Wed, Oct 16, 2024 at 11:51:52PM +0200, Marc Kleine-Budde wrote: > In da722186f654 ("net: fec: set GPR bit on suspend by DT > configuration.") the platform_device_id fec_devtype::driver_data was > converted from holding the quirks to a pointing to struct fec_devinfo. > > The struct fec_devinfo holding the information for the i.MX6SX was > named fec_imx6x_info. > > To align the name of the struct with the SoC's name, rename struct > fec_devinfo fec_imx6x_info to struct fec_devinfo fec_imx6sx_info. Is it better "Rename fec_imx6x_info to fec_imx6sx_info to align SoC's name." Reviewed-by: Frank Li <Frank.Li@nxp.com> > > Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> > --- > drivers/net/ethernet/freescale/fec_main.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c > index 1b55047c0237cbea4e44a5a8335af5c11e2325f8..c57039cc83228dcd980a8fdbc18cd3eab2dfe1a5 100644 > --- a/drivers/net/ethernet/freescale/fec_main.c > +++ b/drivers/net/ethernet/freescale/fec_main.c > @@ -131,7 +131,7 @@ static const struct fec_devinfo fec_mvf600_info = { > FEC_QUIRK_HAS_MDIO_C45, > }; > > -static const struct fec_devinfo fec_imx6x_info = { > +static const struct fec_devinfo fec_imx6sx_info = { > .quirks = FEC_QUIRK_ENET_MAC | FEC_QUIRK_HAS_GBIT | > FEC_QUIRK_HAS_BUFDESC_EX | FEC_QUIRK_HAS_CSUM | > FEC_QUIRK_HAS_VLAN | FEC_QUIRK_HAS_AVB | > @@ -196,7 +196,7 @@ static const struct of_device_id fec_dt_ids[] = { > { .compatible = "fsl,imx28-fec", .data = &fec_imx28_info, }, > { .compatible = "fsl,imx6q-fec", .data = &fec_imx6q_info, }, > { .compatible = "fsl,mvf600-fec", .data = &fec_mvf600_info, }, > - { .compatible = "fsl,imx6sx-fec", .data = &fec_imx6x_info, }, > + { .compatible = "fsl,imx6sx-fec", .data = &fec_imx6sx_info, }, > { .compatible = "fsl,imx6ul-fec", .data = &fec_imx6ul_info, }, > { .compatible = "fsl,imx8mq-fec", .data = &fec_imx8mq_info, }, > { .compatible = "fsl,imx8qm-fec", .data = &fec_imx8qm_info, }, > > -- > 2.45.2 > >
On 16.10.2024 21:59:59, Frank Li wrote: > On Wed, Oct 16, 2024 at 11:51:52PM +0200, Marc Kleine-Budde wrote: > > In da722186f654 ("net: fec: set GPR bit on suspend by DT > > configuration.") the platform_device_id fec_devtype::driver_data was > > converted from holding the quirks to a pointing to struct fec_devinfo. > > > > The struct fec_devinfo holding the information for the i.MX6SX was > > named fec_imx6x_info. > > > > To align the name of the struct with the SoC's name, rename struct > > fec_devinfo fec_imx6x_info to struct fec_devinfo fec_imx6sx_info. > > Is it better > "Rename fec_imx6x_info to fec_imx6sx_info to align SoC's name." Fixed, Marc
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 1b55047c0237cbea4e44a5a8335af5c11e2325f8..c57039cc83228dcd980a8fdbc18cd3eab2dfe1a5 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -131,7 +131,7 @@ static const struct fec_devinfo fec_mvf600_info = { FEC_QUIRK_HAS_MDIO_C45, }; -static const struct fec_devinfo fec_imx6x_info = { +static const struct fec_devinfo fec_imx6sx_info = { .quirks = FEC_QUIRK_ENET_MAC | FEC_QUIRK_HAS_GBIT | FEC_QUIRK_HAS_BUFDESC_EX | FEC_QUIRK_HAS_CSUM | FEC_QUIRK_HAS_VLAN | FEC_QUIRK_HAS_AVB | @@ -196,7 +196,7 @@ static const struct of_device_id fec_dt_ids[] = { { .compatible = "fsl,imx28-fec", .data = &fec_imx28_info, }, { .compatible = "fsl,imx6q-fec", .data = &fec_imx6q_info, }, { .compatible = "fsl,mvf600-fec", .data = &fec_mvf600_info, }, - { .compatible = "fsl,imx6sx-fec", .data = &fec_imx6x_info, }, + { .compatible = "fsl,imx6sx-fec", .data = &fec_imx6sx_info, }, { .compatible = "fsl,imx6ul-fec", .data = &fec_imx6ul_info, }, { .compatible = "fsl,imx8mq-fec", .data = &fec_imx8mq_info, }, { .compatible = "fsl,imx8qm-fec", .data = &fec_imx8qm_info, },
In da722186f654 ("net: fec: set GPR bit on suspend by DT configuration.") the platform_device_id fec_devtype::driver_data was converted from holding the quirks to a pointing to struct fec_devinfo. The struct fec_devinfo holding the information for the i.MX6SX was named fec_imx6x_info. To align the name of the struct with the SoC's name, rename struct fec_devinfo fec_imx6x_info to struct fec_devinfo fec_imx6sx_info. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- drivers/net/ethernet/freescale/fec_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)