]> www.infradead.org Git - nvme.git/commitdiff
ravb: Improve ravb_hw_info instance order
authorGeert Uytterhoeven <geert+renesas@glider.be>
Mon, 24 Jun 2024 13:25:24 +0000 (15:25 +0200)
committerJakub Kicinski <kuba@kernel.org>
Wed, 26 Jun 2024 00:07:04 +0000 (17:07 -0700)
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>
Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Link: https://patch.msgid.link/a76febe3737e26365a784e9193da9363f22aa550.1719234830.git.geert+renesas@glider.be
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/renesas/ravb_main.c

index c1546b916e4ef5812670f2cf3947a2f815dacd93..974e0bb9da1947f29f42ae280af6029be46bc87f 100644 (file)
@@ -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,
 };