mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

i2c: imx: Remove unused .id_table support

Browse source 
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>
This commit is contained in:
Fabio Estevam 2020-11-16 17:29:10 -03:00 committed by Wolfram Sang
parent b4ff421f12
commit c610199cd3
1 changed files with 1 additions and 19 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/i2c/busses/i2c-imx.c
View 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[] = { static const struct of_device_id i2c_imx_dt_ids[] = {
{ .compatible = "fsl,imx1-i2c", .data = &imx1_i2c_hwdata, }, { .compatible = "fsl,imx1-i2c", .data = &imx1_i2c_hwdata, },
{ .compatible = "fsl,imx21-i2c", .data = &imx21_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; return -ENOMEM;
match = device_get_match_data(&pdev->dev); match = device_get_match_data(&pdev->dev);
if (match) i2c_imx->hwdata = match;
i2c_imx->hwdata = match;
else
i2c_imx->hwdata = (struct imx_i2c_hwdata *)
platform_get_device_id(pdev)->driver_data;
/* Setup i2c_imx driver structure */ /* Setup i2c_imx driver structure */
strlcpy(i2c_imx->adapter.name, pdev->name, sizeof(i2c_imx->adapter.name)); 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, .of_match_table = i2c_imx_dt_ids,
.acpi_match_table = i2c_imx_acpi_ids, .acpi_match_table = i2c_imx_acpi_ids,
}, },
.id_table = imx_i2c_devtype,
}; };
static int __init i2c_adap_imx_init(void) static int __init i2c_adap_imx_init(void)