i2c: imx: Remove unused .id_table support
authorFabio Estevam <festevam@gmail.com>
Mon, 16 Nov 2020 20:29:10 +0000 (17:29 -0300)
committerWolfram Sang <wsa@kernel.org>
Wed, 2 Dec 2020 20:29:31 +0000 (21:29 +0100)
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>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
drivers/i2c/busses/i2c-imx.c

index c98529c76348e32097031fa4ba25fc0d7cbc0799..ebf66120c51e6a3428fade5f59c57b875c0e754e 100644 (file)
@@ -233,19 +233,6 @@ static struct imx_i2c_hwdata vf610_i2c_hwdata = {
 
 };
 
-static const struct platform_device_id imx_i2c_devtype[] = {
-       {
-               .name = "imx1-i2c",
-               .driver_data = (kernel_ulong_t)&imx1_i2c_hwdata,
-       }, {
-               .name = "imx21-i2c",
-               .driver_data = (kernel_ulong_t)&imx21_i2c_hwdata,
-       }, {
-               /* sentinel */
-       }
-};
-MODULE_DEVICE_TABLE(platform, imx_i2c_devtype);
-
 static const struct of_device_id i2c_imx_dt_ids[] = {
        { .compatible = "fsl,imx1-i2c", .data = &imx1_i2c_hwdata, },
        { .compatible = "fsl,imx21-i2c", .data = &imx21_i2c_hwdata, },
@@ -1141,11 +1128,7 @@ static int i2c_imx_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        match = device_get_match_data(&pdev->dev);
-       if (match)
-               i2c_imx->hwdata = match;
-       else
-               i2c_imx->hwdata = (struct imx_i2c_hwdata *)
-                               platform_get_device_id(pdev)->driver_data;
+       i2c_imx->hwdata = match;
 
        /* Setup i2c_imx driver structure */
        strlcpy(i2c_imx->adapter.name, pdev->name, sizeof(i2c_imx->adapter.name));
@@ -1316,7 +1299,6 @@ static struct platform_driver i2c_imx_driver = {
                .of_match_table = i2c_imx_dt_ids,
                .acpi_match_table = i2c_imx_acpi_ids,
        },
-       .id_table = imx_i2c_devtype,
 };
 
 static int __init i2c_adap_imx_init(void)