github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge branch 'remove-comma-after-sentinel-entries-in-match-table'

Browse Source 
Siddharth Vadapalli says:

====================
Remove comma after sentinel entries in match table

This series removes the comma present after sentinel entries in the match
tables across all networking subsystem drivers, with the exception of the
davinci_mdio.c driver, for which, the patch posted by Geert at:
https://lore.kernel.org/r/e481b6de46cecc6ea604ae165272c667274cc621.1788437140.git.geert+renesas@glider.be/
does the same.

Since I inquired about a cleanup across the entire networking subsystem but
didn't get a response:
https://lore.kernel.org/r/b3d19098-eccd-4619-b667-ad3b7e0a4422@ti.com/
I decided to post this series. Given that Andrew Lunn acknowledged the
cleanup of the davinci_mdio driver:
https://lore.kernel.org/r/abec6831-d344-489d-b70c-1e5dd4d43c2d@lunn.ch/
and I don't see why the cleanup is specific to davinci_mdio driver alone,
I am hoping that this series is treated identically to the patch that
Geert had posted for the davinci_mdio driver.
====================

Link: https://patch.msgid.link/20260904043724.2955444-1-s-vadapalli@ti.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2026-09-07 16:51:32 -07:00
commit 6f157f39d1
33 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/can/bxcan.c
View File

@ -1080,7 +1080,7 @@ static SIMPLE_DEV_PM_OPS(bxcan_pm_ops, bxcan_suspend, bxcan_resume);
static const struct of_device_id bxcan_of_match[] = {
{.compatible = "st,stm32f4-bxcan"},
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, bxcan_of_match);

4
drivers/net/can/c_can/c_can_platform.c
View File

@ -239,7 +239,7 @@ static const struct platform_device_id c_can_id_table[] = {
.name = "d_can",
.driver_data = (kernel_ulong_t)&d_can_drvdata,
},
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(platform, c_can_id_table);
@ -249,7 +249,7 @@ static const struct of_device_id c_can_of_table[] = {
{ .compatible = "ti,dra7-d_can", .data = &dra7_dcan_drvdata },
{ .compatible = "ti,am3352-d_can", .data = &am3352_dcan_drvdata },
{ .compatible = "ti,am4372-d_can", .data = &am3352_dcan_drvdata },
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, c_can_of_table);

2
drivers/net/can/flexcan/flexcan-core.c
View File

@ -2070,7 +2070,7 @@ static const struct of_device_id flexcan_of_match[] = {
{ .compatible = "fsl,ls1021ar2-flexcan", .data = &fsl_ls1021a_r2_devtype_data, },
{ .compatible = "fsl,lx2160ar1-flexcan", .data = &fsl_lx2160a_r1_devtype_data, },
{ .compatible = "nxp,s32g2-flexcan", .data = &nxp_s32g2_devtype_data, },
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, flexcan_of_match);

2
drivers/net/can/ifi_canfd/ifi_canfd.c
View File

@ -1044,7 +1044,7 @@ static void ifi_canfd_plat_remove(struct platform_device *pdev)
static const struct of_device_id ifi_canfd_of_table[] = {
{ .compatible = "ifi,canfd-1.0", .data = NULL },
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, ifi_canfd_of_table);

2
drivers/net/can/m_can/m_can_platform.c
View File

@ -220,7 +220,7 @@ static const struct dev_pm_ops m_can_pmops = {
static const struct of_device_id m_can_of_table[] = {
{ .compatible = "bosch,m_can", .data = NULL },
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, m_can_of_table);

2
drivers/net/can/sja1000/f81601.c
View File

@ -40,7 +40,7 @@ struct f81601_pci_card {
static const struct pci_device_id f81601_pci_tbl[] = {
{ PCI_DEVICE(0x1c29, 0x1703) },
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(pci, f81601_pci_tbl);

2
drivers/net/can/sja1000/sja1000_platform.c
View File

@ -207,7 +207,7 @@ static const struct of_device_id sp_of_table[] = {
{ .compatible = "nxp,sja1000", .data = NULL, },
{ .compatible = "renesas,rzn1-sja1000", .data = &renesas_data, },
{ .compatible = "technologic,sja1000", .data = &technologic_data, },
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, sp_of_table);

2
drivers/net/dsa/b53/b53_mdio.c
View File

@ -384,7 +384,7 @@ static const struct of_device_id b53_of_match[] = {
{ .compatible = "brcm,bcm5395" },
{ .compatible = "brcm,bcm5397" },
{ .compatible = "brcm,bcm5398" },
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, b53_of_match);

2
drivers/net/dsa/b53/b53_srab.c
View File

@ -515,7 +515,7 @@ static const struct of_device_id b53_srab_of_match[] = {
{ .compatible = "brcm,cygnus-srab", .data = (void *)BCM583XX_DEVICE_ID },
{ .compatible = "brcm,nsp-srab", .data = (void *)BCM58XX_DEVICE_ID },
{ .compatible = "brcm,omega-srab", .data = (void *)BCM583XX_DEVICE_ID },
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, b53_srab_of_match);

2
drivers/net/dsa/bcm_sf2.c
View File

@ -1358,7 +1358,7 @@ static const struct of_device_id bcm_sf2_of_match[] = {
{ .compatible = "brcm,bcm7278-switch-v4.8",
.data = &bcm_sf2_7278_data
},
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, bcm_sf2_of_match);

2
drivers/net/dsa/hirschmann/hellcreek.c
View File

@ -2093,7 +2093,7 @@ static const struct of_device_id hellcreek_of_match[] = {
.compatible = "hirschmann,hellcreek-de1soc-r1",
.data = &de1soc_r1_pdata,
},
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, hellcreek_of_match);

2
drivers/net/dsa/lan9303_i2c.c
View File

@ -96,7 +96,7 @@ MODULE_DEVICE_TABLE(i2c, lan9303_i2c_id);
static const struct of_device_id lan9303_i2c_of_match[] = {
{ .compatible = "smsc,lan9303-i2c", },
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, lan9303_i2c_of_match);

2
drivers/net/dsa/lan9303_mdio.c
View File

@ -157,7 +157,7 @@ static void lan9303_mdio_shutdown(struct mdio_device *mdiodev)
static const struct of_device_id lan9303_mdio_of_match[] = {
{ .compatible = "smsc,lan9303-mdio" },
{ .compatible = "microchip,lan9354-mdio" },
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, lan9303_mdio_of_match);

2
drivers/net/dsa/lantiq/mxl-gsw1xx.c
View File

@ -918,7 +918,7 @@ static const struct of_device_id gsw1xx_of_match[] = {
{ .compatible = "maxlinear,gsw140", .data = &gsw140_data },
{ .compatible = "maxlinear,gsw141", .data = &gsw141_data },
{ .compatible = "maxlinear,gsw145", .data = &gsw140_data },
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, gsw1xx_of_match);

2
drivers/net/dsa/mt7530-mdio.c
View File

@ -142,7 +142,7 @@ static const struct of_device_id mt7530_of_match[] = {
{ .compatible = "mediatek,mt7621", .data = &mt753x_table[ID_MT7621], },
{ .compatible = "mediatek,mt7530", .data = &mt753x_table[ID_MT7530], },
{ .compatible = "mediatek,mt7531", .data = &mt753x_table[ID_MT7531], },
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, mt7530_of_match);

2
drivers/net/dsa/mt7530-mmio.c
View File

@ -14,7 +14,7 @@ static const struct of_device_id mt7988_of_match[] = {
{ .compatible = "airoha,en7581-switch", .data = &mt753x_table[ID_EN7581], },
{ .compatible = "econet,en7528-switch", .data = &mt753x_table[ID_EN7528], },
{ .compatible = "mediatek,mt7988-switch", .data = &mt753x_table[ID_MT7988], },
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, mt7988_of_match);

2
drivers/net/dsa/mv88e6060.c
View File

@ -362,7 +362,7 @@ static const struct of_device_id mv88e6060_of_match[] = {
{
.compatible = "marvell,mv88e6060",
},
{ /* sentinel */ },
{ /* sentinel */ }
};
static struct mdio_driver mv88e6060_driver = {

2
drivers/net/dsa/mv88e6xxx/chip.c
View File

@ -7513,7 +7513,7 @@ static const struct of_device_id mv88e6xxx_of_match[] = {
.compatible = "marvell,mv88e6250",
.data = &mv88e6xxx_table[MV88E6250],
},
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, mv88e6xxx_of_match);

2
drivers/net/dsa/qca/qca8k-8xxx.c
View File

@ -2215,7 +2215,7 @@ static const struct of_device_id qca8k_of_match[] = {
{ .compatible = "qca,qca8328", .data = &qca8328 },
{ .compatible = "qca,qca8334", .data = &qca833x },
{ .compatible = "qca,qca8337", .data = &qca833x },
{ /* sentinel */ },
{ /* sentinel */ }
};
static struct mdio_driver qca8kmdio_driver = {

2
drivers/net/dsa/realtek/rtl8365mb_main.c
View File

@ -3352,7 +3352,7 @@ const struct realtek_variant rtl8365mb_variant = {
static const struct of_device_id rtl8365mb_of_match[] = {
{ .compatible = "realtek,rtl8365mb", .data = &rtl8365mb_variant, },
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, rtl8365mb_of_match);

2
drivers/net/dsa/realtek/rtl8366rb.c
View File

@ -1839,7 +1839,7 @@ const struct realtek_variant rtl8366rb_variant = {
static const struct of_device_id rtl8366rb_of_match[] = {
{ .compatible = "realtek,rtl8366rb", .data = &rtl8366rb_variant, },
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, rtl8366rb_of_match);

2
drivers/net/dsa/rzn1_a5psw.c
View File

@ -1299,7 +1299,7 @@ static void a5psw_shutdown(struct platform_device *pdev)
static const struct of_device_id a5psw_of_mtable[] = {
{ .compatible = "renesas,rzn1-a5psw", },
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, a5psw_of_mtable);

2
drivers/net/dsa/sja1105/sja1105_main.c
View File

@ -3374,7 +3374,7 @@ static const struct of_device_id sja1105_dt_ids[] = {
{ .compatible = "nxp,sja1110b", .data = &sja1110b_info },
{ .compatible = "nxp,sja1110c", .data = &sja1110c_info },
{ .compatible = "nxp,sja1110d", .data = &sja1110d_info },
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, sja1105_dt_ids);

4
drivers/net/ethernet/broadcom/asp2/bcmasp.c
View File

@ -1209,7 +1209,7 @@ static const struct of_device_id bcmasp_of_match[] = {
{ .compatible = "brcm,asp-v2.1", .data = &v21_plat_data },
{ .compatible = "brcm,asp-v2.2", .data = &v22_plat_data },
{ .compatible = "brcm,asp-v3.0", .data = &v30_plat_data },
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, bcmasp_of_match);
@ -1217,7 +1217,7 @@ static const struct of_device_id bcmasp_mdio_of_match[] = {
{ .compatible = "brcm,asp-v2.1-mdio", },
{ .compatible = "brcm,asp-v2.2-mdio", },
{ .compatible = "brcm,asp-v3.0-mdio", },
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, bcmasp_mdio_of_match);

4
drivers/net/ethernet/spacemit/k1_emac.c
View File

@ -1161,7 +1161,7 @@ static const struct ethtool_rmon_hist_range emac_rmon_hist_ranges[] = {
{ 512, 1023 },
{ 1024, 1518 },
{ 1519, 4096 },
{ /* sentinel */ },
{ /* sentinel */ }
};
/* Like dev_fetch_dstats(), but we only use tx_drops */
@ -2066,7 +2066,7 @@ static const struct dev_pm_ops emac_pm_ops = {
static const struct of_device_id emac_of_match[] = {
{ .compatible = "spacemit,k1-emac" },
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, emac_of_match);

2
drivers/net/ethernet/ti/am65-cpsw-nuss.c
View File

@ -3506,7 +3506,7 @@ static const struct of_device_id am65_cpsw_nuss_of_mtable[] = {
{ .compatible = "ti,j7200-cpswxg-nuss", .data = &j7200_cpswxg_pdata},
{ .compatible = "ti,j721e-cpswxg-nuss", .data = &j721e_cpswxg_pdata},
{ .compatible = "ti,j784s4-cpswxg-nuss", .data = &j784s4_cpswxg_pdata},
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, am65_cpsw_nuss_of_mtable);

2
drivers/net/ethernet/ti/cpsw.c
View File

@ -1529,7 +1529,7 @@ static const struct of_device_id cpsw_of_mtable[] = {
{ .compatible = "ti,am335x-cpsw"},
{ .compatible = "ti,am4372-cpsw"},
{ .compatible = "ti,dra7-cpsw"},
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, cpsw_of_mtable);

2
drivers/net/ethernet/ti/cpsw_new.c
View File

@ -1875,7 +1875,7 @@ static const struct of_device_id cpsw_of_mtable[] = {
{ .compatible = "ti,am335x-cpsw-switch"},
{ .compatible = "ti,am4372-cpsw-switch"},
{ .compatible = "ti,dra7-cpsw-switch"},
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, cpsw_of_mtable);

2
drivers/net/mdio/mdio-bcm-iproc.c
View File

@ -195,7 +195,7 @@ static const struct dev_pm_ops iproc_mdio_pm_ops = {
static const struct of_device_id iproc_mdio_of_match[] = {
{ .compatible = "brcm,iproc-mdio", },
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, iproc_mdio_of_match);

2
drivers/net/mdio/mdio-bcm-unimac.c
View File

@ -345,7 +345,7 @@ static const struct of_device_id unimac_mdio_ids[] = {
{ .compatible = "brcm,genet-mdio-v2", },
{ .compatible = "brcm,genet-mdio-v1", },
{ .compatible = "brcm,unimac-mdio", },
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, unimac_mdio_ids);

2
drivers/net/pcs/pcs-xpcs-plat.c
View File

@ -438,7 +438,7 @@ static const struct of_device_id xpcs_of_ids[] = {
{ .compatible = "snps,dw-xpcs-gen4-6g", .data = &xpcs_pma_gen4_6g },
{ .compatible = "snps,dw-xpcs-gen5-10g", .data = &xpcs_pma_gen5_10g },
{ .compatible = "snps,dw-xpcs-gen5-12g", .data = &xpcs_pma_gen5_12g },
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, xpcs_of_ids);

2
drivers/net/phy/nxp-c45-tja11xx.c
View File

@ -2180,7 +2180,7 @@ module_phy_driver(nxp_c45_driver);
static const struct mdio_device_id __maybe_unused nxp_c45_tbl[] = {
{ PHY_ID_MATCH_MODEL(PHY_ID_TJA_1103) },
{ PHY_ID_MATCH_MODEL(PHY_ID_TJA_1120) },
{ /*sentinel*/ },
{ /*sentinel*/ }
};
MODULE_DEVICE_TABLE(mdio, nxp_c45_tbl);

2
drivers/net/wan/slic_ds26522.c
View File

@ -219,7 +219,7 @@ static int slic_ds26522_probe(struct spi_device *spi)
static const struct spi_device_id slic_ds26522_id[] = {
{ .name = "ds26522" },
{ /* sentinel */ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(spi, slic_ds26522_id);