qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ata: Drop commas after OF match table sentinels 

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2042790

It does not make sense to have a comma after a sentinel, as any new
elements must be added before the sentinel.

Add comments to clarify the purpose of the empty elements.
Rewrap entries to a single line to have a consistent style.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Acked-by: Florian Fainelli <f.fainelli@gmail.com> [ahci_brcm]
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
(cherry picked from commit 5e776d7b20f040f3219128cee17a1191d66a0f3f)
Signed-off-by: Tomas Henzl <thenzl@redhat.com>
This commit is contained in:
Tomas Henzl 2022-04-09 22:09:40 +02:00
parent d20d96b470
commit 1f50c9e3f4
24 changed files with 33 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ata/ahci_brcm.c
View File

@ -427,7 +427,7 @@ static const struct of_device_id ahci_of_match[] = {
{.compatible = "brcm,bcm63138-ahci", .data = (void *)BRCM_SATA_BCM7445}, {.compatible = "brcm,bcm63138-ahci", .data = (void *)BRCM_SATA_BCM7445},
{.compatible = "brcm,bcm-nsp-ahci", .data = (void *)BRCM_SATA_NSP}, {.compatible = "brcm,bcm-nsp-ahci", .data = (void *)BRCM_SATA_NSP},
{.compatible = "brcm,bcm7216-ahci", .data = (void *)BRCM_SATA_BCM7216}, {.compatible = "brcm,bcm7216-ahci", .data = (void *)BRCM_SATA_BCM7216},
{}, { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, ahci_of_match); MODULE_DEVICE_TABLE(of, ahci_of_match);

2
drivers/ata/ahci_ceva.c
View File

@ -363,7 +363,7 @@ static SIMPLE_DEV_PM_OPS(ahci_ceva_pm_ops, ceva_ahci_suspend, ceva_ahci_resume);
static const struct of_device_id ceva_ahci_of_match[] = { static const struct of_device_id ceva_ahci_of_match[] = {
{ .compatible = "ceva,ahci-1v84" }, { .compatible = "ceva,ahci-1v84" },
{}, { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, ceva_ahci_of_match); MODULE_DEVICE_TABLE(of, ceva_ahci_of_match);

2
drivers/ata/ahci_da850.c
View File

@ -241,7 +241,7 @@ static SIMPLE_DEV_PM_OPS(ahci_da850_pm_ops, ahci_platform_suspend,
static const struct of_device_id ahci_da850_of_match[] = { static const struct of_device_id ahci_da850_of_match[] = {
{ .compatible = "ti,da850-ahci", }, { .compatible = "ti,da850-ahci", },
{ }, { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, ahci_da850_of_match); MODULE_DEVICE_TABLE(of, ahci_da850_of_match);

2
drivers/ata/ahci_dm816.c
View File

@ -176,7 +176,7 @@ static SIMPLE_DEV_PM_OPS(ahci_dm816_pm_ops,
static const struct of_device_id ahci_dm816_of_match[] = { static const struct of_device_id ahci_dm816_of_match[] = {
{ .compatible = "ti,dm816-ahci", }, { .compatible = "ti,dm816-ahci", },
{ }, { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, ahci_dm816_of_match); MODULE_DEVICE_TABLE(of, ahci_dm816_of_match);

2
drivers/ata/ahci_imx.c
View File

@ -811,7 +811,7 @@ static const struct of_device_id imx_ahci_of_match[] = {
{ .compatible = "fsl,imx6q-ahci", .data = (void *)AHCI_IMX6Q }, { .compatible = "fsl,imx6q-ahci", .data = (void *)AHCI_IMX6Q },
{ .compatible = "fsl,imx6qp-ahci", .data = (void *)AHCI_IMX6QP }, { .compatible = "fsl,imx6qp-ahci", .data = (void *)AHCI_IMX6QP },
{ .compatible = "fsl,imx8qm-ahci", .data = (void *)AHCI_IMX8QM }, { .compatible = "fsl,imx8qm-ahci", .data = (void *)AHCI_IMX8QM },
{}, { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, imx_ahci_of_match); MODULE_DEVICE_TABLE(of, imx_ahci_of_match);

2
drivers/ata/ahci_mtk.c
View File

@ -169,7 +169,7 @@ static SIMPLE_DEV_PM_OPS(ahci_pm_ops, ahci_platform_suspend,
static const struct of_device_id ahci_of_match[] = { static const struct of_device_id ahci_of_match[] = {
{ .compatible = "mediatek,mtk-ahci", }, { .compatible = "mediatek,mtk-ahci", },
{}, { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, ahci_of_match); MODULE_DEVICE_TABLE(of, ahci_of_match);

2
drivers/ata/ahci_mvebu.c
View File

@ -239,7 +239,7 @@ static const struct of_device_id ahci_mvebu_of_match[] = {
.compatible = "marvell,armada-3700-ahci", .compatible = "marvell,armada-3700-ahci",
.data = &ahci_mvebu_armada_3700_plat_data, .data = &ahci_mvebu_armada_3700_plat_data,
}, },
{ }, { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, ahci_mvebu_of_match); MODULE_DEVICE_TABLE(of, ahci_mvebu_of_match);

2
drivers/ata/ahci_octeon.c
View File

@ -80,7 +80,7 @@ static int ahci_octeon_remove(struct platform_device *pdev)
static const struct of_device_id octeon_ahci_match[] = { static const struct of_device_id octeon_ahci_match[] = {
{ .compatible = "cavium,octeon-7130-sata-uctl", }, { .compatible = "cavium,octeon-7130-sata-uctl", },
{}, { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, octeon_ahci_match); MODULE_DEVICE_TABLE(of, octeon_ahci_match);

2
drivers/ata/ahci_platform.c
View File

@ -88,7 +88,7 @@ static const struct of_device_id ahci_of_match[] = {
{ .compatible = "snps,dwc-ahci", }, { .compatible = "snps,dwc-ahci", },
{ .compatible = "hisilicon,hisi-ahci", }, { .compatible = "hisilicon,hisi-ahci", },
{ .compatible = "cavium,octeon-7130-ahci", }, { .compatible = "cavium,octeon-7130-ahci", },
{}, { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, ahci_of_match); MODULE_DEVICE_TABLE(of, ahci_of_match);

2
drivers/ata/ahci_qoriq.c
View File

@ -77,7 +77,7 @@ static const struct of_device_id ahci_qoriq_of_match[] = {
{ .compatible = "fsl,ls1088a-ahci", .data = (void *)AHCI_LS1088A}, { .compatible = "fsl,ls1088a-ahci", .data = (void *)AHCI_LS1088A},
{ .compatible = "fsl,ls2088a-ahci", .data = (void *)AHCI_LS2088A}, { .compatible = "fsl,ls2088a-ahci", .data = (void *)AHCI_LS2088A},
{ .compatible = "fsl,lx2160a-ahci", .data = (void *)AHCI_LX2160A}, { .compatible = "fsl,lx2160a-ahci", .data = (void *)AHCI_LX2160A},
{}, { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, ahci_qoriq_of_match); MODULE_DEVICE_TABLE(of, ahci_qoriq_of_match);

2
drivers/ata/ahci_st.c
View File

@ -232,7 +232,7 @@ static SIMPLE_DEV_PM_OPS(st_ahci_pm_ops, st_ahci_suspend, st_ahci_resume);
static const struct of_device_id st_ahci_match[] = { static const struct of_device_id st_ahci_match[] = {
{ .compatible = "st,ahci", }, { .compatible = "st,ahci", },
{}, { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, st_ahci_match); MODULE_DEVICE_TABLE(of, st_ahci_match);

2
drivers/ata/ahci_sunxi.c
View File

@ -286,7 +286,7 @@ static SIMPLE_DEV_PM_OPS(ahci_sunxi_pm_ops, ahci_platform_suspend,
static const struct of_device_id ahci_sunxi_of_match[] = { static const struct of_device_id ahci_sunxi_of_match[] = {
{ .compatible = "allwinner,sun4i-a10-ahci", }, { .compatible = "allwinner,sun4i-a10-ahci", },
{ .compatible = "allwinner,sun8i-r40-ahci", }, { .compatible = "allwinner,sun8i-r40-ahci", },
{ }, { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, ahci_sunxi_of_match); MODULE_DEVICE_TABLE(of, ahci_sunxi_of_match);

2
drivers/ata/ahci_xgene.c
View File

@ -726,7 +726,7 @@ MODULE_DEVICE_TABLE(acpi, xgene_ahci_acpi_match);
static const struct of_device_id xgene_ahci_of_match[] = { static const struct of_device_id xgene_ahci_of_match[] = {
{.compatible = "apm,xgene-ahci", .data = (void *) XGENE_AHCI_V1}, {.compatible = "apm,xgene-ahci", .data = (void *) XGENE_AHCI_V1},
{.compatible = "apm,xgene-ahci-v2", .data = (void *) XGENE_AHCI_V2}, {.compatible = "apm,xgene-ahci-v2", .data = (void *) XGENE_AHCI_V2},
{}, { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, xgene_ahci_of_match); MODULE_DEVICE_TABLE(of, xgene_ahci_of_match);

6
drivers/ata/pata_ftide010.c
View File

@ -554,10 +554,8 @@ static int pata_ftide010_remove(struct platform_device *pdev)
} }
static const struct of_device_id pata_ftide010_of_match[] = { static const struct of_device_id pata_ftide010_of_match[] = {
{ { .compatible = "faraday,ftide010", },
.compatible = "faraday,ftide010", { /* sentinel */ }
},
{},
}; };
static struct platform_driver pata_ftide010_driver = { static struct platform_driver pata_ftide010_driver = {

2
drivers/ata/pata_ixp4xx_cf.c
View File

@ -293,7 +293,7 @@ static int ixp4xx_pata_probe(struct platform_device *pdev)
static const struct of_device_id ixp4xx_pata_of_match[] = { static const struct of_device_id ixp4xx_pata_of_match[] = {
{ .compatible = "intel,ixp4xx-compact-flash", }, { .compatible = "intel,ixp4xx-compact-flash", },
{ }, { /* sentinel */ }
}; };
static struct platform_driver ixp4xx_pata_platform_driver = { static struct platform_driver ixp4xx_pata_platform_driver = {

18
drivers/ata/pata_macio.c
View File

@ -1329,19 +1329,11 @@ static int pata_macio_pci_resume(struct pci_dev *pdev)
static const struct of_device_id pata_macio_match[] = static const struct of_device_id pata_macio_match[] =
{ {
{ { .name = "IDE", },
.name = "IDE", { .name = "ATA", },
}, { .type = "ide", },
{ { .type = "ata", },
.name = "ATA", { /* sentinel */ }
},
{
.type = "ide",
},
{
.type = "ata",
},
{},
}; };
MODULE_DEVICE_TABLE(of, pata_macio_match); MODULE_DEVICE_TABLE(of, pata_macio_match);

2
drivers/ata/pata_mpc52xx.c
View File

@ -850,7 +850,7 @@ mpc52xx_ata_resume(struct platform_device *op)
static const struct of_device_id mpc52xx_ata_of_match[] = { static const struct of_device_id mpc52xx_ata_of_match[] = {
{ .compatible = "fsl,mpc5200-ata", }, { .compatible = "fsl,mpc5200-ata", },
{ .compatible = "mpc5200-ata", }, { .compatible = "mpc5200-ata", },
{}, { /* sentinel */ }
}; };

6
drivers/ata/pata_octeon_cf.c
View File

@ -1006,10 +1006,8 @@ static void octeon_cf_shutdown(struct device *dev)
} }
static const struct of_device_id octeon_cf_match[] = { static const struct of_device_id octeon_cf_match[] = {
{ { .compatible = "cavium,ebt3000-compact-flash", },
.compatible = "cavium,ebt3000-compact-flash", { /* sentinel */ }
},
{},
}; };
MODULE_DEVICE_TABLE(of, octeon_cf_match); MODULE_DEVICE_TABLE(of, octeon_cf_match);

2
drivers/ata/pata_of_platform.c
View File

@ -79,7 +79,7 @@ static int pata_of_platform_probe(struct platform_device *ofdev)
static const struct of_device_id pata_of_platform_match[] = { static const struct of_device_id pata_of_platform_match[] = {
{ .compatible = "ata-generic", }, { .compatible = "ata-generic", },
{ }, { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, pata_of_platform_match); MODULE_DEVICE_TABLE(of, pata_of_platform_match);

10
drivers/ata/sata_fsl.c
View File

@ -1579,13 +1579,9 @@ static int sata_fsl_resume(struct platform_device *op)
#endif #endif
static const struct of_device_id fsl_sata_match[] = { static const struct of_device_id fsl_sata_match[] = {
{ { .compatible = "fsl,pq-sata", },
.compatible = "fsl,pq-sata", { .compatible = "fsl,pq-sata-v2", },
}, { /* sentinel */ }
{
.compatible = "fsl,pq-sata-v2",
},
{},
}; };
MODULE_DEVICE_TABLE(of, fsl_sata_match); MODULE_DEVICE_TABLE(of, fsl_sata_match);

6
drivers/ata/sata_gemini.c
View File

@ -419,10 +419,8 @@ static int gemini_sata_remove(struct platform_device *pdev)
} }
static const struct of_device_id gemini_sata_of_match[] = { static const struct of_device_id gemini_sata_of_match[] = {
{ { .compatible = "cortina,gemini-sata-bridge", },
.compatible = "cortina,gemini-sata-bridge", { /* sentinel */ }
},
{},
}; };
static struct platform_driver gemini_sata_driver = { static struct platform_driver gemini_sata_driver = {

2
drivers/ata/sata_highbank.c
View File

@ -444,7 +444,7 @@ static struct scsi_host_template ahci_highbank_platform_sht = {
static const struct of_device_id ahci_of_match[] = { static const struct of_device_id ahci_of_match[] = {
{ .compatible = "calxeda,hb-ahci" }, { .compatible = "calxeda,hb-ahci" },
{}, { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, ahci_of_match); MODULE_DEVICE_TABLE(of, ahci_of_match);

2
drivers/ata/sata_mv.c
View File

@ -4277,7 +4277,7 @@ static int mv_platform_resume(struct platform_device *pdev)
static const struct of_device_id mv_sata_dt_ids[] = { static const struct of_device_id mv_sata_dt_ids[] = {
{ .compatible = "marvell,armada-370-sata", }, { .compatible = "marvell,armada-370-sata", },
{ .compatible = "marvell,orion-sata", }, { .compatible = "marvell,orion-sata", },
{}, { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, mv_sata_dt_ids); MODULE_DEVICE_TABLE(of, mv_sata_dt_ids);
#endif #endif

2
drivers/ata/sata_rcar.c
View File

@ -852,7 +852,7 @@ static const struct of_device_id sata_rcar_match[] = {
.compatible = "renesas,rcar-gen3-sata", .compatible = "renesas,rcar-gen3-sata",
.data = (void *)RCAR_GEN3_SATA .data = (void *)RCAR_GEN3_SATA
}, },
{ }, { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, sata_rcar_match); MODULE_DEVICE_TABLE(of, sata_rcar_match);