From: Uwe Kleine-König (The Capable Hub) Date: Tue, 26 May 2026 14:17:29 +0000 (+0200) Subject: net: Use named initializer for zorro_device_id arrays X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4933a658369ab945873cca8bcbfbbc142ddfe584;p=thirdparty%2Flinux.git 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) Reviewed-by: Geert Uytterhoeven Link: https://patch.msgid.link/2243204c0f57f79750de00c072914354d4f65707.1779803053.git.u.kleine-koenig@baylibre.com Signed-off-by: Jakub Kicinski --- diff --git a/drivers/net/ethernet/8390/hydra.c b/drivers/net/ethernet/8390/hydra.c index fd9dcdc356e68..9a59915436d29 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 fe7a74707aa40..370c19aa5fb98 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 c24dd4fe7a106..cb1d5ed208743 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 ce94454250453..672c4996b30e9 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 fa201da567edd..ec6e7e8c14fea 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);