Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dmaengine: imx-dma: Remove unused .id_table

Since 5.10-rc1 i.MX is a devicetree-only platform, so simplify the code
by removing the unused non-DT support.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Link: https://lore.kernel.org/r/20201124143405.2764-1-festevam@gmail.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

authored by

Fabio Estevam and committed by
Vinod Koul
0ab785c8 5d0c3533

+4 -29
+4 -29
drivers/dma/imx-dma.c
··· 191 191 int request; 192 192 }; 193 193 194 - static const struct platform_device_id imx_dma_devtype[] = { 195 - { 196 - .name = "imx1-dma", 197 - .driver_data = IMX1_DMA, 198 - }, { 199 - .name = "imx21-dma", 200 - .driver_data = IMX21_DMA, 201 - }, { 202 - .name = "imx27-dma", 203 - .driver_data = IMX27_DMA, 204 - }, { 205 - /* sentinel */ 206 - } 207 - }; 208 - MODULE_DEVICE_TABLE(platform, imx_dma_devtype); 209 - 210 194 static const struct of_device_id imx_dma_of_dev_id[] = { 211 195 { 212 - .compatible = "fsl,imx1-dma", 213 - .data = &imx_dma_devtype[IMX1_DMA], 196 + .compatible = "fsl,imx1-dma", .data = (const void *)IMX1_DMA, 214 197 }, { 215 - .compatible = "fsl,imx21-dma", 216 - .data = &imx_dma_devtype[IMX21_DMA], 198 + .compatible = "fsl,imx21-dma", .data = (const void *)IMX21_DMA, 217 199 }, { 218 - .compatible = "fsl,imx27-dma", 219 - .data = &imx_dma_devtype[IMX27_DMA], 200 + .compatible = "fsl,imx27-dma", .data = (const void *)IMX27_DMA, 220 201 }, { 221 202 /* sentinel */ 222 203 } ··· 1037 1056 { 1038 1057 struct imxdma_engine *imxdma; 1039 1058 struct resource *res; 1040 - const struct of_device_id *of_id; 1041 1059 int ret, i; 1042 1060 int irq, irq_err; 1043 - 1044 - of_id = of_match_device(imx_dma_of_dev_id, &pdev->dev); 1045 - if (of_id) 1046 - pdev->id_entry = of_id->data; 1047 1061 1048 1062 imxdma = devm_kzalloc(&pdev->dev, sizeof(*imxdma), GFP_KERNEL); 1049 1063 if (!imxdma) 1050 1064 return -ENOMEM; 1051 1065 1052 1066 imxdma->dev = &pdev->dev; 1053 - imxdma->devtype = pdev->id_entry->driver_data; 1067 + imxdma->devtype = (enum imx_dma_type)of_device_get_match_data(&pdev->dev); 1054 1068 1055 1069 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 1056 1070 imxdma->base = devm_ioremap_resource(&pdev->dev, res); ··· 1239 1263 .name = "imx-dma", 1240 1264 .of_match_table = imx_dma_of_dev_id, 1241 1265 }, 1242 - .id_table = imx_dma_devtype, 1243 1266 .remove = imxdma_remove, 1244 1267 }; 1245 1268