i2c: imx: Remove unused .id_table support
Fabio Estevam
reviewerPATCH 1/1 i2c: 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.
--- drivers/i2c/busses/i2c-imx.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-)
drivers/i2c/busses/i2c-imx.c +1 -19
@@ -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 )
Signature · 1 line
2.17.1
Fabio Estevam
reviewerPATCH 2/2 i2c: imx: Remove unneeded 'match' variable
There is no need to have the intermediate 'match' variable.
Assign the device_get_match_data() directly to simplify the code.
--- drivers/i2c/busses/i2c-imx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/i2c/busses/i2c-imx.c +1 -3
@@ -1309,7 +1309,6 @@ static int i2c_imx_probe(struct platform_device *pdev)void __iomem *base;int irq, ret;dma_addr_t phy_addr; -const struct imx_i2c_hwdata *match;dev_dbg (&pdev->dev,"<%s>\n" , __func__);
@@ -1327,8 +1326,7 @@ static int i2c_imx_probe(struct platform_device *pdev)if (!i2c_imx)return -ENOMEM ; - match =device_get_match_data (&pdev->dev); - i2c_imx->hwdata = match; + i2c_imx->hwdata =device_get_match_data (&pdev->dev);/* Setup i2c_imx driver structure */ strlcpy (i2c_imx->adapter.name, pdev->name,sizeof (i2c_imx->adapter.name));
Signature · 1 line
2.17.1
Hi Fabio,
Quoted 14 lines · Fabio Estevam
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 <[email protected]>--- drivers/i2c/busses/i2c-imx.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-)drivers/i2c/busses/i2c-imx.c +0
-0
drivers/i2c/busses/i2c-imx.c static struct imx_i2c_hwdata vf610_i2c_hwdata = { · line 240
Quoted 8 lines
drivers/i2c/busses/i2c-imx.c +0
-5@@ -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, - }, {
Please grep for the driver name instead of guessing that it is unused. This driver is indeed used with platform binding in the coldfire architecture.
Regards,
Sascha
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |