ASoC: imx-audmux: Remove unused .id_table
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. Get rid of the .id_table since it is no longer used. Signed-off-by: Fabio Estevam <festevam@gmail.com> Link: https://lore.kernel.org/r/20201123200917.16447-1-festevam@gmail.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Родитель
b3cf78e0da
Коммит
6a8b8b582d
|
@ -170,22 +170,9 @@ static enum imx_audmux_type {
|
||||||
IMX31_AUDMUX,
|
IMX31_AUDMUX,
|
||||||
} audmux_type;
|
} audmux_type;
|
||||||
|
|
||||||
static const struct platform_device_id imx_audmux_ids[] = {
|
|
||||||
{
|
|
||||||
.name = "imx21-audmux",
|
|
||||||
.driver_data = IMX21_AUDMUX,
|
|
||||||
}, {
|
|
||||||
.name = "imx31-audmux",
|
|
||||||
.driver_data = IMX31_AUDMUX,
|
|
||||||
}, {
|
|
||||||
/* sentinel */
|
|
||||||
}
|
|
||||||
};
|
|
||||||
MODULE_DEVICE_TABLE(platform, imx_audmux_ids);
|
|
||||||
|
|
||||||
static const struct of_device_id imx_audmux_dt_ids[] = {
|
static const struct of_device_id imx_audmux_dt_ids[] = {
|
||||||
{ .compatible = "fsl,imx21-audmux", .data = &imx_audmux_ids[0], },
|
{ .compatible = "fsl,imx21-audmux", .data = (void *)IMX21_AUDMUX, },
|
||||||
{ .compatible = "fsl,imx31-audmux", .data = &imx_audmux_ids[1], },
|
{ .compatible = "fsl,imx31-audmux", .data = (void *)IMX31_AUDMUX, },
|
||||||
{ /* sentinel */ }
|
{ /* sentinel */ }
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(of, imx_audmux_dt_ids);
|
MODULE_DEVICE_TABLE(of, imx_audmux_dt_ids);
|
||||||
|
@ -300,9 +287,6 @@ static int imx_audmux_parse_dt_defaults(struct platform_device *pdev,
|
||||||
|
|
||||||
static int imx_audmux_probe(struct platform_device *pdev)
|
static int imx_audmux_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
const struct of_device_id *of_id =
|
|
||||||
of_match_device(imx_audmux_dt_ids, &pdev->dev);
|
|
||||||
|
|
||||||
audmux_base = devm_platform_ioremap_resource(pdev, 0);
|
audmux_base = devm_platform_ioremap_resource(pdev, 0);
|
||||||
if (IS_ERR(audmux_base))
|
if (IS_ERR(audmux_base))
|
||||||
return PTR_ERR(audmux_base);
|
return PTR_ERR(audmux_base);
|
||||||
|
@ -314,9 +298,7 @@ static int imx_audmux_probe(struct platform_device *pdev)
|
||||||
audmux_clk = NULL;
|
audmux_clk = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (of_id)
|
audmux_type = (enum imx_audmux_type)of_device_get_match_data(&pdev->dev);
|
||||||
pdev->id_entry = of_id->data;
|
|
||||||
audmux_type = pdev->id_entry->driver_data;
|
|
||||||
|
|
||||||
switch (audmux_type) {
|
switch (audmux_type) {
|
||||||
case IMX31_AUDMUX:
|
case IMX31_AUDMUX:
|
||||||
|
@ -335,7 +317,6 @@ static int imx_audmux_probe(struct platform_device *pdev)
|
||||||
if (!regcache)
|
if (!regcache)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
if (of_id)
|
|
||||||
imx_audmux_parse_dt_defaults(pdev, pdev->dev.of_node);
|
imx_audmux_parse_dt_defaults(pdev, pdev->dev.of_node);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -386,7 +367,6 @@ static const struct dev_pm_ops imx_audmux_pm = {
|
||||||
static struct platform_driver imx_audmux_driver = {
|
static struct platform_driver imx_audmux_driver = {
|
||||||
.probe = imx_audmux_probe,
|
.probe = imx_audmux_probe,
|
||||||
.remove = imx_audmux_remove,
|
.remove = imx_audmux_remove,
|
||||||
.id_table = imx_audmux_ids,
|
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = DRIVER_NAME,
|
.name = DRIVER_NAME,
|
||||||
.pm = &imx_audmux_pm,
|
.pm = &imx_audmux_pm,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче