diff options
-rw-r--r-- | drivers/dma/bestcomm/bestcomm.c | 4 | ||||
-rw-r--r-- | drivers/dma/k3dma.c | 2 | ||||
-rw-r--r-- | drivers/dma/mmp_pdma.c | 2 | ||||
-rw-r--r-- | drivers/dma/mmp_tdma.c | 2 | ||||
-rw-r--r-- | drivers/dma/mpc512x_dma.c | 2 | ||||
-rw-r--r-- | drivers/dma/mv_xor.c | 2 | ||||
-rw-r--r-- | drivers/dma/sirf-dma.c | 2 | ||||
-rw-r--r-- | drivers/dma/sun6i-dma.c | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/drivers/dma/bestcomm/bestcomm.c b/drivers/dma/bestcomm/bestcomm.c index fa378d88f6c8..180fedb418cc 100644 --- a/drivers/dma/bestcomm/bestcomm.c +++ b/drivers/dma/bestcomm/bestcomm.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #define DRIVER_NAME "bestcomm-core" | 30 | #define DRIVER_NAME "bestcomm-core" |
31 | 31 | ||
32 | /* MPC5200 device tree match tables */ | 32 | /* MPC5200 device tree match tables */ |
33 | static struct of_device_id mpc52xx_sram_ids[] = { | 33 | static const struct of_device_id mpc52xx_sram_ids[] = { |
34 | { .compatible = "fsl,mpc5200-sram", }, | 34 | { .compatible = "fsl,mpc5200-sram", }, |
35 | { .compatible = "mpc5200-sram", }, | 35 | { .compatible = "mpc5200-sram", }, |
36 | {} | 36 | {} |
@@ -481,7 +481,7 @@ static int mpc52xx_bcom_remove(struct platform_device *op) | |||
481 | return 0; | 481 | return 0; |
482 | } | 482 | } |
483 | 483 | ||
484 | static struct of_device_id mpc52xx_bcom_of_match[] = { | 484 | static const struct of_device_id mpc52xx_bcom_of_match[] = { |
485 | { .compatible = "fsl,mpc5200-bestcomm", }, | 485 | { .compatible = "fsl,mpc5200-bestcomm", }, |
486 | { .compatible = "mpc5200-bestcomm", }, | 486 | { .compatible = "mpc5200-bestcomm", }, |
487 | {}, | 487 | {}, |
diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c index 6f7f43529ccb..3ac9256ce87e 100644 --- a/drivers/dma/k3dma.c +++ b/drivers/dma/k3dma.c | |||
@@ -654,7 +654,7 @@ static void k3_dma_free_desc(struct virt_dma_desc *vd) | |||
654 | kfree(ds); | 654 | kfree(ds); |
655 | } | 655 | } |
656 | 656 | ||
657 | static struct of_device_id k3_pdma_dt_ids[] = { | 657 | static const struct of_device_id k3_pdma_dt_ids[] = { |
658 | { .compatible = "hisilicon,k3-dma-1.0", }, | 658 | { .compatible = "hisilicon,k3-dma-1.0", }, |
659 | {} | 659 | {} |
660 | }; | 660 | }; |
diff --git a/drivers/dma/mmp_pdma.c b/drivers/dma/mmp_pdma.c index 8926f271904e..4c4cda98072b 100644 --- a/drivers/dma/mmp_pdma.c +++ b/drivers/dma/mmp_pdma.c | |||
@@ -970,7 +970,7 @@ static int mmp_pdma_chan_init(struct mmp_pdma_device *pdev, int idx, int irq) | |||
970 | return 0; | 970 | return 0; |
971 | } | 971 | } |
972 | 972 | ||
973 | static struct of_device_id mmp_pdma_dt_ids[] = { | 973 | static const struct of_device_id mmp_pdma_dt_ids[] = { |
974 | { .compatible = "marvell,pdma-1.0", }, | 974 | { .compatible = "marvell,pdma-1.0", }, |
975 | {} | 975 | {} |
976 | }; | 976 | }; |
diff --git a/drivers/dma/mmp_tdma.c b/drivers/dma/mmp_tdma.c index 70c2fa9963cd..bc7bc5329ca5 100644 --- a/drivers/dma/mmp_tdma.c +++ b/drivers/dma/mmp_tdma.c | |||
@@ -594,7 +594,7 @@ struct dma_chan *mmp_tdma_xlate(struct of_phandle_args *dma_spec, | |||
594 | return dma_request_channel(mask, mmp_tdma_filter_fn, ¶m); | 594 | return dma_request_channel(mask, mmp_tdma_filter_fn, ¶m); |
595 | } | 595 | } |
596 | 596 | ||
597 | static struct of_device_id mmp_tdma_dt_ids[] = { | 597 | static const struct of_device_id mmp_tdma_dt_ids[] = { |
598 | { .compatible = "marvell,adma-1.0", .data = (void *)MMP_AUD_TDMA}, | 598 | { .compatible = "marvell,adma-1.0", .data = (void *)MMP_AUD_TDMA}, |
599 | { .compatible = "marvell,pxa910-squ", .data = (void *)PXA910_SQU}, | 599 | { .compatible = "marvell,pxa910-squ", .data = (void *)PXA910_SQU}, |
600 | {} | 600 | {} |
diff --git a/drivers/dma/mpc512x_dma.c b/drivers/dma/mpc512x_dma.c index c66a82ea2559..e6281e7aa46e 100644 --- a/drivers/dma/mpc512x_dma.c +++ b/drivers/dma/mpc512x_dma.c | |||
@@ -1068,7 +1068,7 @@ static int mpc_dma_remove(struct platform_device *op) | |||
1068 | return 0; | 1068 | return 0; |
1069 | } | 1069 | } |
1070 | 1070 | ||
1071 | static struct of_device_id mpc_dma_match[] = { | 1071 | static const struct of_device_id mpc_dma_match[] = { |
1072 | { .compatible = "fsl,mpc5121-dma", }, | 1072 | { .compatible = "fsl,mpc5121-dma", }, |
1073 | { .compatible = "fsl,mpc8308-dma", }, | 1073 | { .compatible = "fsl,mpc8308-dma", }, |
1074 | {}, | 1074 | {}, |
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c index 5ef567ee335b..1c56001df676 100644 --- a/drivers/dma/mv_xor.c +++ b/drivers/dma/mv_xor.c | |||
@@ -1245,7 +1245,7 @@ static int mv_xor_remove(struct platform_device *pdev) | |||
1245 | } | 1245 | } |
1246 | 1246 | ||
1247 | #ifdef CONFIG_OF | 1247 | #ifdef CONFIG_OF |
1248 | static struct of_device_id mv_xor_dt_ids[] = { | 1248 | static const struct of_device_id mv_xor_dt_ids[] = { |
1249 | { .compatible = "marvell,orion-xor", }, | 1249 | { .compatible = "marvell,orion-xor", }, |
1250 | {}, | 1250 | {}, |
1251 | }; | 1251 | }; |
diff --git a/drivers/dma/sirf-dma.c b/drivers/dma/sirf-dma.c index d0086e9f2082..a1afda43b8ef 100644 --- a/drivers/dma/sirf-dma.c +++ b/drivers/dma/sirf-dma.c | |||
@@ -896,7 +896,7 @@ static const struct dev_pm_ops sirfsoc_dma_pm_ops = { | |||
896 | SET_SYSTEM_SLEEP_PM_OPS(sirfsoc_dma_pm_suspend, sirfsoc_dma_pm_resume) | 896 | SET_SYSTEM_SLEEP_PM_OPS(sirfsoc_dma_pm_suspend, sirfsoc_dma_pm_resume) |
897 | }; | 897 | }; |
898 | 898 | ||
899 | static struct of_device_id sirfsoc_dma_match[] = { | 899 | static const struct of_device_id sirfsoc_dma_match[] = { |
900 | { .compatible = "sirf,prima2-dmac", }, | 900 | { .compatible = "sirf,prima2-dmac", }, |
901 | { .compatible = "sirf,marco-dmac", }, | 901 | { .compatible = "sirf,marco-dmac", }, |
902 | {}, | 902 | {}, |
diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c index 7ebcf9bec698..5358453bdb93 100644 --- a/drivers/dma/sun6i-dma.c +++ b/drivers/dma/sun6i-dma.c | |||
@@ -896,7 +896,7 @@ static struct sun6i_dma_config sun8i_a23_dma_cfg = { | |||
896 | .nr_max_vchans = 37, | 896 | .nr_max_vchans = 37, |
897 | }; | 897 | }; |
898 | 898 | ||
899 | static struct of_device_id sun6i_dma_match[] = { | 899 | static const struct of_device_id sun6i_dma_match[] = { |
900 | { .compatible = "allwinner,sun6i-a31-dma", .data = &sun6i_a31_dma_cfg }, | 900 | { .compatible = "allwinner,sun6i-a31-dma", .data = &sun6i_a31_dma_cfg }, |
901 | { .compatible = "allwinner,sun8i-a23-dma", .data = &sun8i_a23_dma_cfg }, | 901 | { .compatible = "allwinner,sun8i-a23-dma", .data = &sun8i_a23_dma_cfg }, |
902 | { /* sentinel */ } | 902 | { /* sentinel */ } |