diff mbox series

[net-next,v2,1/2] ravb: Improve ravb_hw_info instance order

Message ID a76febe3737e26365a784e9193da9363f22aa550.1719234830.git.geert+renesas@glider.be (mailing list archive)
State Accepted
Delegated to: Geert Uytterhoeven
Headers show
Series ravb: Add MII support for R-Car V4M | expand

Commit Message

Geert Uytterhoeven June 24, 2024, 1:25 p.m. UTC
Move ravb_gen2_hw_info before ravb_gen3_hw_info to match
ravb_match_table[] order.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - New.
---
 drivers/net/ethernet/renesas/ravb_main.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Comments

Niklas Söderlund June 24, 2024, 3:42 p.m. UTC | #1
Hi Geert,

Thanks for your work.

On 2024-06-24 15:25:24 +0200, Geert Uytterhoeven wrote:
> Move ravb_gen2_hw_info before ravb_gen3_hw_info to match
> ravb_match_table[] order.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>

> ---
> v2:
>   - New.
> ---
>  drivers/net/ethernet/renesas/ravb_main.c | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
> index c1546b916e4ef581..974e0bb9da1947f2 100644
> --- a/drivers/net/ethernet/renesas/ravb_main.c
> +++ b/drivers/net/ethernet/renesas/ravb_main.c
> @@ -2652,7 +2652,7 @@ static int ravb_mdio_release(struct ravb_private *priv)
>  	return 0;
>  }
>  
> -static const struct ravb_hw_info ravb_gen3_hw_info = {
> +static const struct ravb_hw_info ravb_gen2_hw_info = {
>  	.receive = ravb_rx_rcar,
>  	.set_rate = ravb_set_rate_rcar,
>  	.set_feature = ravb_set_features_rcar,
> @@ -2668,16 +2668,13 @@ static const struct ravb_hw_info ravb_gen3_hw_info = {
>  	.rx_buffer_size = SZ_2K +
>  			  SKB_DATA_ALIGN(sizeof(struct skb_shared_info)),
>  	.rx_desc_size = sizeof(struct ravb_ex_rx_desc),
> -	.internal_delay = 1,
> -	.tx_counters = 1,
> -	.multi_irqs = 1,
> -	.irq_en_dis = 1,
> -	.ccc_gac = 1,
> +	.aligned_tx = 1,
> +	.gptp = 1,
>  	.nc_queues = 1,
>  	.magic_pkt = 1,
>  };
>  
> -static const struct ravb_hw_info ravb_gen2_hw_info = {
> +static const struct ravb_hw_info ravb_gen3_hw_info = {
>  	.receive = ravb_rx_rcar,
>  	.set_rate = ravb_set_rate_rcar,
>  	.set_feature = ravb_set_features_rcar,
> @@ -2693,8 +2690,11 @@ static const struct ravb_hw_info ravb_gen2_hw_info = {
>  	.rx_buffer_size = SZ_2K +
>  			  SKB_DATA_ALIGN(sizeof(struct skb_shared_info)),
>  	.rx_desc_size = sizeof(struct ravb_ex_rx_desc),
> -	.aligned_tx = 1,
> -	.gptp = 1,
> +	.internal_delay = 1,
> +	.tx_counters = 1,
> +	.multi_irqs = 1,
> +	.irq_en_dis = 1,
> +	.ccc_gac = 1,
>  	.nc_queues = 1,
>  	.magic_pkt = 1,
>  };
> -- 
> 2.34.1
>
Sergey Shtylyov June 24, 2024, 8:11 p.m. UTC | #2
On 6/24/24 4:25 PM, Geert Uytterhoeven wrote:

> Move ravb_gen2_hw_info before ravb_gen3_hw_info to match
> ravb_match_table[] order.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>

[...]

MBR, Sergey
diff mbox series

Patch

diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index c1546b916e4ef581..974e0bb9da1947f2 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -2652,7 +2652,7 @@  static int ravb_mdio_release(struct ravb_private *priv)
 	return 0;
 }
 
-static const struct ravb_hw_info ravb_gen3_hw_info = {
+static const struct ravb_hw_info ravb_gen2_hw_info = {
 	.receive = ravb_rx_rcar,
 	.set_rate = ravb_set_rate_rcar,
 	.set_feature = ravb_set_features_rcar,
@@ -2668,16 +2668,13 @@  static const struct ravb_hw_info ravb_gen3_hw_info = {
 	.rx_buffer_size = SZ_2K +
 			  SKB_DATA_ALIGN(sizeof(struct skb_shared_info)),
 	.rx_desc_size = sizeof(struct ravb_ex_rx_desc),
-	.internal_delay = 1,
-	.tx_counters = 1,
-	.multi_irqs = 1,
-	.irq_en_dis = 1,
-	.ccc_gac = 1,
+	.aligned_tx = 1,
+	.gptp = 1,
 	.nc_queues = 1,
 	.magic_pkt = 1,
 };
 
-static const struct ravb_hw_info ravb_gen2_hw_info = {
+static const struct ravb_hw_info ravb_gen3_hw_info = {
 	.receive = ravb_rx_rcar,
 	.set_rate = ravb_set_rate_rcar,
 	.set_feature = ravb_set_features_rcar,
@@ -2693,8 +2690,11 @@  static const struct ravb_hw_info ravb_gen2_hw_info = {
 	.rx_buffer_size = SZ_2K +
 			  SKB_DATA_ALIGN(sizeof(struct skb_shared_info)),
 	.rx_desc_size = sizeof(struct ravb_ex_rx_desc),
-	.aligned_tx = 1,
-	.gptp = 1,
+	.internal_delay = 1,
+	.tx_counters = 1,
+	.multi_irqs = 1,
+	.irq_en_dis = 1,
+	.ccc_gac = 1,
 	.nc_queues = 1,
 	.magic_pkt = 1,
 };