leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iommu/mediatek-v1: Avoid build fail when build as module

Browse Source 
When this driver build as module, It build fail like:

ERROR: modpost: "of_phandle_iterator_args"
[drivers/iommu/mtk_iommu_v1.ko] undefined!

This patch remove this interface to avoid this build fail.

Reported-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Link: https://lore.kernel.org/r/20210412064843.11614-1-yong.wu@mediatek.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Yong Wu 2021-04-12 14:48:42 +08:00 committed by Joerg Roedel
parent b34ea31fe0
commit f90a9a85fb
1 changed files with 31 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
drivers/iommu/mtk_iommu_v1.c
View File

@ -424,23 +424,21 @@ static struct iommu_device *mtk_iommu_probe_device(struct device *dev)
{ {
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
struct of_phandle_args iommu_spec; struct of_phandle_args iommu_spec;
struct of_phandle_iterator it;
struct mtk_iommu_data *data; struct mtk_iommu_data *data;
int err; int err, idx = 0;
of_for_each_phandle(&it, err, dev->of_node, "iommus", while (!of_parse_phandle_with_args(dev->of_node, "iommus",
"#iommu-cells", -1) { "#iommu-cells",
int count = of_phandle_iterator_args(&it, iommu_spec.args, idx, &iommu_spec)) {
MAX_PHANDLE_ARGS);
iommu_spec.np = of_node_get(it.node);
iommu_spec.args_count = count;
mtk_iommu_create_mapping(dev, &iommu_spec); err = mtk_iommu_create_mapping(dev, &iommu_spec);
of_node_put(iommu_spec.np);
if (err)
return ERR_PTR(err);
/* dev->iommu_fwspec might have changed */ /* dev->iommu_fwspec might have changed */
fwspec = dev_iommu_fwspec_get(dev); fwspec = dev_iommu_fwspec_get(dev);
idx++;
of_node_put(iommu_spec.np);
} }
if (!fwspec || fwspec->ops != &mtk_iommu_ops) if (!fwspec || fwspec->ops != &mtk_iommu_ops)
@ -549,10 +547,8 @@ static int mtk_iommu_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct resource *res; struct resource *res;
struct component_match *match = NULL; struct component_match *match = NULL;
struct of_phandle_args larb_spec;
struct of_phandle_iterator it;
void *protect; void *protect;
int larb_nr, ret, err; int larb_nr, ret, i;
data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
if (!data) if (!data)
@ -580,35 +576,33 @@ static int mtk_iommu_probe(struct platform_device *pdev)
if (IS_ERR(data->bclk)) if (IS_ERR(data->bclk))
return PTR_ERR(data->bclk); return PTR_ERR(data->bclk);
larb_nr = 0; larb_nr = of_count_phandle_with_args(dev->of_node,
of_for_each_phandle(&it, err, dev->of_node, "mediatek,larbs", NULL);
"mediatek,larbs", NULL, 0) { if (larb_nr < 0)
return larb_nr;
for (i = 0; i < larb_nr; i++) {
struct device_node *larbnode;
struct platform_device *plarbdev; struct platform_device *plarbdev;
int count = of_phandle_iterator_args(&it, larb_spec.args,
MAX_PHANDLE_ARGS);
if (count) larbnode = of_parse_phandle(dev->of_node, "mediatek,larbs", i);
if (!larbnode)
return -EINVAL;
if (!of_device_is_available(larbnode)) {
of_node_put(larbnode);
continue; continue;
}
larb_spec.np = of_node_get(it.node); plarbdev = of_find_device_by_node(larbnode);
if (!of_device_is_available(larb_spec.np))
continue;
plarbdev = of_find_device_by_node(larb_spec.np);
if (!plarbdev) { if (!plarbdev) {
plarbdev = of_platform_device_create( of_node_put(larbnode);
larb_spec.np, NULL,
platform_bus_type.dev_root);
if (!plarbdev) {
of_node_put(larb_spec.np);
return -EPROBE_DEFER; return -EPROBE_DEFER;
} }
} data->larb_imu[i].dev = &plarbdev->dev;
data->larb_imu[larb_nr].dev = &plarbdev->dev;
component_match_add_release(dev, &match, release_of, component_match_add_release(dev, &match, release_of,
compare_of, larb_spec.np); compare_of, larbnode);
larb_nr++;
} }
platform_set_drvdata(pdev, data); platform_set_drvdata(pdev, data);