summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>2026-05-26 17:17:29 +0300
committerJakub Kicinski <kuba@kernel.org>2026-05-29 04:07:11 +0300
commit4933a658369ab945873cca8bcbfbbc142ddfe584 (patch)
tree566d424adf8bb08f92c4d86c3de14cc0201bec55
parentf945ec1a7d0ec1f958719b5ee4d0076a81b45f86 (diff)
downloadlinux-4933a658369ab945873cca8bcbfbbc142ddfe584.tar.xz
net: Use named initializer for zorro_device_id arrays
Using named initializers is more explicit and thus easier to parse for a human. While touching these arrays, drop explicit zeros from the list terminator. This change doesn't introduce changes to the compiled zorro_device_id arrays. Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com> Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> Link: https://patch.msgid.link/2243204c0f57f79750de00c072914354d4f65707.1779803053.git.u.kleine-koenig@baylibre.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-rw-r--r--drivers/net/ethernet/8390/hydra.c4
-rw-r--r--drivers/net/ethernet/8390/xsurf100.c4
-rw-r--r--drivers/net/ethernet/8390/zorro8390.c6
-rw-r--r--drivers/net/ethernet/amd/a2065.c8
-rw-r--r--drivers/net/ethernet/amd/ariadne.c4
5 files changed, 13 insertions, 13 deletions
diff --git a/drivers/net/ethernet/8390/hydra.c b/drivers/net/ethernet/8390/hydra.c
index fd9dcdc356e6..9a59915436d2 100644
--- a/drivers/net/ethernet/8390/hydra.c
+++ b/drivers/net/ethernet/8390/hydra.c
@@ -66,8 +66,8 @@ static void hydra_block_output(struct net_device *dev, int count,
static void hydra_remove_one(struct zorro_dev *z);
static struct zorro_device_id hydra_zorro_tbl[] = {
- { ZORRO_PROD_HYDRA_SYSTEMS_AMIGANET },
- { 0 }
+ { .id = ZORRO_PROD_HYDRA_SYSTEMS_AMIGANET },
+ { }
};
MODULE_DEVICE_TABLE(zorro, hydra_zorro_tbl);
diff --git a/drivers/net/ethernet/8390/xsurf100.c b/drivers/net/ethernet/8390/xsurf100.c
index fe7a74707aa4..370c19aa5fb9 100644
--- a/drivers/net/ethernet/8390/xsurf100.c
+++ b/drivers/net/ethernet/8390/xsurf100.c
@@ -357,8 +357,8 @@ static void xsurf100_remove(struct zorro_dev *zdev)
}
static const struct zorro_device_id xsurf100_zorro_tbl[] = {
- { ZORRO_PROD_INDIVIDUAL_COMPUTERS_X_SURF100, },
- { 0 }
+ { .id = ZORRO_PROD_INDIVIDUAL_COMPUTERS_X_SURF100 },
+ { }
};
MODULE_DEVICE_TABLE(zorro, xsurf100_zorro_tbl);
diff --git a/drivers/net/ethernet/8390/zorro8390.c b/drivers/net/ethernet/8390/zorro8390.c
index c24dd4fe7a10..cb1d5ed20874 100644
--- a/drivers/net/ethernet/8390/zorro8390.c
+++ b/drivers/net/ethernet/8390/zorro8390.c
@@ -262,9 +262,9 @@ static void zorro8390_remove_one(struct zorro_dev *z)
}
static struct zorro_device_id zorro8390_zorro_tbl[] = {
- { ZORRO_PROD_VILLAGE_TRONIC_ARIADNE2, },
- { ZORRO_PROD_INDIVIDUAL_COMPUTERS_X_SURF, },
- { 0 }
+ { .id = ZORRO_PROD_VILLAGE_TRONIC_ARIADNE2 },
+ { .id = ZORRO_PROD_INDIVIDUAL_COMPUTERS_X_SURF },
+ { }
};
MODULE_DEVICE_TABLE(zorro, zorro8390_zorro_tbl);
diff --git a/drivers/net/ethernet/amd/a2065.c b/drivers/net/ethernet/amd/a2065.c
index ce9445425045..672c4996b30e 100644
--- a/drivers/net/ethernet/amd/a2065.c
+++ b/drivers/net/ethernet/amd/a2065.c
@@ -647,10 +647,10 @@ static void a2065_remove_one(struct zorro_dev *z);
static const struct zorro_device_id a2065_zorro_tbl[] = {
- { ZORRO_PROD_CBM_A2065_1 },
- { ZORRO_PROD_CBM_A2065_2 },
- { ZORRO_PROD_AMERISTAR_A2065 },
- { 0 }
+ { .id = ZORRO_PROD_CBM_A2065_1 },
+ { .id = ZORRO_PROD_CBM_A2065_2 },
+ { .id = ZORRO_PROD_AMERISTAR_A2065 },
+ { }
};
MODULE_DEVICE_TABLE(zorro, a2065_zorro_tbl);
diff --git a/drivers/net/ethernet/amd/ariadne.c b/drivers/net/ethernet/amd/ariadne.c
index fa201da567ed..ec6e7e8c14fe 100644
--- a/drivers/net/ethernet/amd/ariadne.c
+++ b/drivers/net/ethernet/amd/ariadne.c
@@ -693,8 +693,8 @@ static void ariadne_remove_one(struct zorro_dev *z)
}
static const struct zorro_device_id ariadne_zorro_tbl[] = {
- { ZORRO_PROD_VILLAGE_TRONIC_ARIADNE },
- { 0 }
+ { .id = ZORRO_PROD_VILLAGE_TRONIC_ARIADNE },
+ { }
};
MODULE_DEVICE_TABLE(zorro, ariadne_zorro_tbl);