ata: Drop commas after OF match table sentinels

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>

diff --git a/drivers/ata/ahci_brcm.c b/drivers/ata/ahci_brcm.c
index 64dd8aa397d5276b9cd917e9bf60a032e502f620..ab8552b1ff2a14ad548ba066b93bf3b0bc0f7d83 100644 (file)
--- a/drivers/ata/ahci_brcm.c
+++ b/drivers/ata/ahci_brcm.c
@@ -427,7 +427,7 @@ static const struct of_device_id ahci_of_match[] = {
        {.compatible = "brcm,bcm63138-ahci", .data = (void *)BRCM_SATA_BCM7445},
        {.compatible = "brcm,bcm-nsp-ahci", .data = (void *)BRCM_SATA_NSP},
        {.compatible = "brcm,bcm7216-ahci", .data = (void *)BRCM_SATA_BCM7216},
-       {},
+       { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, ahci_of_match);
 

diff --git a/drivers/ata/ahci_ceva.c b/drivers/ata/ahci_ceva.c
index acf59f51b3569d71c755d66856f2452c28f7d52d..cb24ecf36fafe040c97aa7c90eb02f76c87c249c 100644 (file)
--- a/drivers/ata/ahci_ceva.c
+++ b/drivers/ata/ahci_ceva.c
@@ -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[] = {
        { .compatible = "ceva,ahci-1v84" },
-       {},
+       { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, ceva_ahci_of_match);
 

diff --git a/drivers/ata/ahci_da850.c b/drivers/ata/ahci_da850.c
index 0e82766007128e72d68967fa371648eef339e8ec..052c28e250aa8d96ca2c2f90e796fa91ab480423 100644 (file)
--- a/drivers/ata/ahci_da850.c
+++ b/drivers/ata/ahci_da850.c
@@ -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[] = {
        { .compatible = "ti,da850-ahci", },
-       { },
+       { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, ahci_da850_of_match);
 

diff --git a/drivers/ata/ahci_dm816.c b/drivers/ata/ahci_dm816.c
index 8bec4104167142c5bbff128549746533b35dfb2f..8a92112dcd59080ac9658d221f1c0414612cf653 100644 (file)
--- a/drivers/ata/ahci_dm816.c
+++ b/drivers/ata/ahci_dm816.c
@@ -176,7 +176,7 @@ static SIMPLE_DEV_PM_OPS(ahci_dm816_pm_ops,
 
 static const struct of_device_id ahci_dm816_of_match[] = {
        { .compatible = "ti,dm816-ahci", },
-       { },
+       { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, ahci_dm816_of_match);
 

diff --git a/drivers/ata/ahci_imx.c b/drivers/ata/ahci_imx.c
index 388baf528fa81cabf9b185944af32de80c3f6307..79aa9f2853129f6ead661865d47bfefc84fb634d 100644 (file)
--- a/drivers/ata/ahci_imx.c
+++ b/drivers/ata/ahci_imx.c
@@ -811,7 +811,7 @@ static const struct of_device_id imx_ahci_of_match[] = {
        { .compatible = "fsl,imx6q-ahci", .data = (void *)AHCI_IMX6Q },
        { .compatible = "fsl,imx6qp-ahci", .data = (void *)AHCI_IMX6QP },
        { .compatible = "fsl,imx8qm-ahci", .data = (void *)AHCI_IMX8QM },
-       {},
+       { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, imx_ahci_of_match);
 

diff --git a/drivers/ata/ahci_mtk.c b/drivers/ata/ahci_mtk.c
index d9b08ae7c3b22104079ca92061d8afdb1d982703..1f6c85fde9830ac1334fa4991dcb009a09d6897e 100644 (file)
--- a/drivers/ata/ahci_mtk.c
+++ b/drivers/ata/ahci_mtk.c
@@ -169,7 +169,7 @@ static SIMPLE_DEV_PM_OPS(ahci_pm_ops, ahci_platform_suspend,
 
 static const struct of_device_id ahci_of_match[] = {
        { .compatible = "mediatek,mtk-ahci", },
-       {},
+       { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, ahci_of_match);
 

diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c
index 3ad46d26d9d517902c451cd8cae50a16d8caa142..991413a272e608a24397a242d203e9113ac32c0e 100644 (file)
--- a/drivers/ata/ahci_mvebu.c
+++ b/drivers/ata/ahci_mvebu.c
@@ -239,7 +239,7 @@ static const struct of_device_id ahci_mvebu_of_match[] = {
                .compatible = "marvell,armada-3700-ahci",
                .data = &ahci_mvebu_armada_3700_plat_data,
        },
-       { },
+       { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, ahci_mvebu_of_match);
 

diff --git a/drivers/ata/ahci_octeon.c b/drivers/ata/ahci_octeon.c
index 5a44e089c6bb6ae23f7e4f984c7cc069c0e77744..b9460b91288f772df0b076ca219f2b6aeaad0123 100644 (file)
--- a/drivers/ata/ahci_octeon.c
+++ b/drivers/ata/ahci_octeon.c
@@ -80,7 +80,7 @@ static int ahci_octeon_remove(struct platform_device *pdev)
 
 static const struct of_device_id octeon_ahci_match[] = {
        { .compatible = "cavium,octeon-7130-sata-uctl", },
-       {},
+       { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, octeon_ahci_match);
 

diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
index 3aab2e3d57f3373a787abb126527307ea479046b..28a8de5b48b979c9b733d2e35e5025357d7ee58a 100644 (file)
--- a/drivers/ata/ahci_platform.c
+++ b/drivers/ata/ahci_platform.c
@@ -88,7 +88,7 @@ static const struct of_device_id ahci_of_match[] = {
        { .compatible = "snps,dwc-ahci", },
        { .compatible = "hisilicon,hisi-ahci", },
        { .compatible = "cavium,octeon-7130-ahci", },
-       {},
+       { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, ahci_of_match);
 

diff --git a/drivers/ata/ahci_qoriq.c b/drivers/ata/ahci_qoriq.c
index cca78e25b1734ec8ac152339fda8edb2695f9be5..6cd61842ad48bda6dd91c55f434f7f5814c4abd5 100644 (file)
--- a/drivers/ata/ahci_qoriq.c
+++ b/drivers/ata/ahci_qoriq.c
@@ -77,7 +77,7 @@ static const struct of_device_id ahci_qoriq_of_match[] = {
        { .compatible = "fsl,ls1088a-ahci", .data = (void *)AHCI_LS1088A},
        { .compatible = "fsl,ls2088a-ahci", .data = (void *)AHCI_LS2088A},
        { .compatible = "fsl,lx2160a-ahci", .data = (void *)AHCI_LX2160A},
-       {},
+       { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, ahci_qoriq_of_match);
 

diff --git a/drivers/ata/ahci_st.c b/drivers/ata/ahci_st.c
index c268264c2129c52abd9faa671cf97e18c4bb3569..7526653c843b32261b8f7f3d4e263ce01c58b9b5 100644 (file)
--- a/drivers/ata/ahci_st.c
+++ b/drivers/ata/ahci_st.c
@@ -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[] = {
        { .compatible = "st,ahci", },
-       {},
+       { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, st_ahci_match);
 

diff --git a/drivers/ata/ahci_sunxi.c b/drivers/ata/ahci_sunxi.c
index 56b695136977ab728e3ed6771f8d392ccbe4f270..c7273c1cb0c73b9b0032aedbfc9404a51b311c96 100644 (file)
--- a/drivers/ata/ahci_sunxi.c
+++ b/drivers/ata/ahci_sunxi.c
@@ -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[] = {
        { .compatible = "allwinner,sun4i-a10-ahci", },
        { .compatible = "allwinner,sun8i-r40-ahci", },
-       { },
+       { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, ahci_sunxi_of_match);
 

diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c
index c5b392e07e65042e467585a5b0741f90ad39853f..7bb5db17f86422fb036fb212f4bde8f11b31331b 100644 (file)
--- a/drivers/ata/ahci_xgene.c
+++ b/drivers/ata/ahci_xgene.c
@@ -726,7 +726,7 @@ MODULE_DEVICE_TABLE(acpi, xgene_ahci_acpi_match);
 static const struct of_device_id xgene_ahci_of_match[] = {
        {.compatible = "apm,xgene-ahci", .data = (void *) XGENE_AHCI_V1},
        {.compatible = "apm,xgene-ahci-v2", .data = (void *) XGENE_AHCI_V2},
-       {},
+       { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, xgene_ahci_of_match);
 

diff --git a/drivers/ata/pata_ftide010.c b/drivers/ata/pata_ftide010.c
index 34cb104f6b43e5cf237f0c93a4ae9ea87e7bb3c9..2e35505b683c764999684dda38936f5a7b917e70 100644 (file)
--- a/drivers/ata/pata_ftide010.c
+++ b/drivers/ata/pata_ftide010.c
@@ -554,10 +554,8 @@ static int pata_ftide010_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id pata_ftide010_of_match[] = {
-       {
-               .compatible = "faraday,ftide010",
-       },
-       {},
+       { .compatible = "faraday,ftide010", },
+       { /* sentinel */ }
 };
 
 static struct platform_driver pata_ftide010_driver = {

diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c
index 17b557c91e1c78fc0b01b750a5b7e2786202afa7..e225913a619d8414be59e9ff00c7e78c98dbc244 100644 (file)
--- a/drivers/ata/pata_ixp4xx_cf.c
+++ b/drivers/ata/pata_ixp4xx_cf.c
@@ -293,7 +293,7 @@ static int ixp4xx_pata_probe(struct platform_device *pdev)
 
 static const struct of_device_id ixp4xx_pata_of_match[] = {
        { .compatible = "intel,ixp4xx-compact-flash", },
-       { },
+       { /* sentinel */ }
 };
 
 static struct platform_driver ixp4xx_pata_platform_driver = {

diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c
index 3c3509f18cdd0aeec98da1dac3632f9c284fe880..42798402cf631aef0092485365eee748a88472b5 100644 (file)
--- a/drivers/ata/pata_macio.c
+++ b/drivers/ata/pata_macio.c
@@ -1329,19 +1329,11 @@ static int pata_macio_pci_resume(struct pci_dev *pdev)
 
 static const struct of_device_id pata_macio_match[] =
 {
-       {
-       .name           = "IDE",
-       },
-       {
-       .name           = "ATA",
-       },
-       {
-       .type           = "ide",
-       },
-       {
-       .type           = "ata",
-       },
-       {},
+       { .name = "IDE", },
+       { .name = "ATA", },
+       { .type = "ide", },
+       { .type = "ata", },
+       { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, pata_macio_match);
 

diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index a2a3a95c71edeb26fb3986184cc5848dbd85f355..3250ef317df6bd2202b52e1298a8caca6dea7587 100644 (file)
--- a/drivers/ata/pata_mpc52xx.c
+++ b/drivers/ata/pata_mpc52xx.c
@@ -850,7 +850,7 @@ mpc52xx_ata_resume(struct platform_device *op)
 static const struct of_device_id mpc52xx_ata_of_match[] = {
        { .compatible = "fsl,mpc5200-ata", },
        { .compatible = "mpc5200-ata", },
-       {},
+       { /* sentinel */ }
 };
 
 

diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c
index aaa9f95d814c6c1e506a193070722dc183b8bf31..6b5ed3046b44d861677b943baa655c2aca9d8a51 100644 (file)
--- a/drivers/ata/pata_octeon_cf.c
+++ b/drivers/ata/pata_octeon_cf.c
@@ -1006,10 +1006,8 @@ static void octeon_cf_shutdown(struct device *dev)
 }
 
 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);
 

diff --git a/drivers/ata/pata_of_platform.c b/drivers/ata/pata_of_platform.c
index c3a40b717dcdcc2a2cedf718dbc59daf5b234b75..ac5a633c00a57ac1f1828f6e4499dca53870c267 100644 (file)
--- a/drivers/ata/pata_of_platform.c
+++ b/drivers/ata/pata_of_platform.c
@@ -79,7 +79,7 @@ static int pata_of_platform_probe(struct platform_device *ofdev)
 
 static const struct of_device_id pata_of_platform_match[] = {
        { .compatible = "ata-generic", },
-       { },
+       { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, pata_of_platform_match);
 

diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index cfe93c420488b8b212e6efdf3a526e70adb5ea92..dd27a34e3ce92ec869fc1fab6a3f8e58b24044c6 100644 (file)
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -1581,13 +1581,9 @@ static int sata_fsl_resume(struct platform_device *op)
 #endif
 
 static const struct of_device_id fsl_sata_match[] = {
-       {
-               .compatible = "fsl,pq-sata",
-       },
-       {
-               .compatible = "fsl,pq-sata-v2",
-       },
-       {},
+       { .compatible = "fsl,pq-sata", },
+       { .compatible = "fsl,pq-sata-v2", },
+       { /* sentinel */ }
 };
 
 MODULE_DEVICE_TABLE(of, fsl_sata_match);

diff --git a/drivers/ata/sata_gemini.c b/drivers/ata/sata_gemini.c
index 440a63de20d01a07d8fe9c718a90a57602f41cee..00e1c7941d0ea0dd4ae5841959b136789cf6c9f7 100644 (file)
--- a/drivers/ata/sata_gemini.c
+++ b/drivers/ata/sata_gemini.c
@@ -419,10 +419,8 @@ static int gemini_sata_remove(struct platform_device *pdev)
 }
 
 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 = {

diff --git a/drivers/ata/sata_highbank.c b/drivers/ata/sata_highbank.c
index 40bb27f83ecf453374aa313206252e498a0dd916..dfbf9493e45194b7dbf3f38fa702af1bb981da0f 100644 (file)
--- a/drivers/ata/sata_highbank.c
+++ b/drivers/ata/sata_highbank.c
@@ -444,7 +444,7 @@ static struct scsi_host_template ahci_highbank_platform_sht = {
 
 static const struct of_device_id ahci_of_match[] = {
        { .compatible = "calxeda,hb-ahci" },
-       {},
+       { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, ahci_of_match);
 

diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 3b2a0d228306349949f32e912b6c6fca123f03ed..de5bd02cad447de75803cf8cfb8a053ce081cfeb 100644 (file)
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -4277,7 +4277,7 @@ static int mv_platform_resume(struct platform_device *pdev)
 static const struct of_device_id mv_sata_dt_ids[] = {
        { .compatible = "marvell,armada-370-sata", },
        { .compatible = "marvell,orion-sata", },
-       {},
+       { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, mv_sata_dt_ids);
 #endif

diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c
index 8e4516acb3f6acbc59e7f9be88866e22e0da6cfd..590ebea996017c13409db10df89b7175ede06f98 100644 (file)
--- a/drivers/ata/sata_rcar.c
+++ b/drivers/ata/sata_rcar.c
@@ -852,7 +852,7 @@ static const struct of_device_id sata_rcar_match[] = {
                .compatible = "renesas,rcar-gen3-sata",
                .data = (void *)RCAR_GEN3_SATA
        },
-       { },
+       { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, sata_rcar_match);