spi: imx: Remove unused .id_table support

Since 5.10-rc1 i.MX is a devicetree-only platform and the existing
.id_table support in this driver was only useful for old non-devicetree
platforms.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Link: https://lore.kernel.org/r/20201116202606.29888-1-festevam@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 8911465d8f476a714852c944e6fc6e442739a010..7513ef552d794435581a7cb45c1d3f5231cd0f5c 100644 (file)
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -1019,33 +1019,6 @@ static struct spi_imx_devtype_data imx53_ecspi_devtype_data = {
        .devtype = IMX53_ECSPI,
 };
 
-static const struct platform_device_id spi_imx_devtype[] = {
-       {
-               .name = "imx1-cspi",
-               .driver_data = (kernel_ulong_t) &imx1_cspi_devtype_data,
-       }, {
-               .name = "imx21-cspi",
-               .driver_data = (kernel_ulong_t) &imx21_cspi_devtype_data,
-       }, {
-               .name = "imx27-cspi",
-               .driver_data = (kernel_ulong_t) &imx27_cspi_devtype_data,
-       }, {
-               .name = "imx31-cspi",
-               .driver_data = (kernel_ulong_t) &imx31_cspi_devtype_data,
-       }, {
-               .name = "imx35-cspi",
-               .driver_data = (kernel_ulong_t) &imx35_cspi_devtype_data,
-       }, {
-               .name = "imx51-ecspi",
-               .driver_data = (kernel_ulong_t) &imx51_ecspi_devtype_data,
-       }, {
-               .name = "imx53-ecspi",
-               .driver_data = (kernel_ulong_t) &imx53_ecspi_devtype_data,
-       }, {
-               /* sentinel */
-       }
-};
-
 static const struct of_device_id spi_imx_dt_ids[] = {
        { .compatible = "fsl,imx1-cspi", .data = &imx1_cspi_devtype_data, },
        { .compatible = "fsl,imx21-cspi", .data = &imx21_cspi_devtype_data, },
@@ -1581,8 +1554,7 @@ static int spi_imx_probe(struct platform_device *pdev)
        struct spi_imx_data *spi_imx;
        struct resource *res;
        int ret, irq, spi_drctl;
-       const struct spi_imx_devtype_data *devtype_data = of_id ? of_id->data :
-               (struct spi_imx_devtype_data *)pdev->id_entry->driver_data;
+       const struct spi_imx_devtype_data *devtype_data = of_id->data;
        bool slave_mode;
        u32 val;
 
@@ -1823,7 +1795,6 @@ static struct platform_driver spi_imx_driver = {
                   .of_match_table = spi_imx_dt_ids,
                   .pm = &imx_spi_pm,
        },
-       .id_table = spi_imx_devtype,
        .probe = spi_imx_probe,
        .remove = spi_imx_remove,
 };