a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iommu/rockchip: Fix build without CONFIG_OF

Browse Source 
The rockchip iommu driver references its of_device_id table
from the init function, which fails to build when the table
is undefined:

iommu/rockchip-iommu.c: In function 'rk_iommu_init':
iommu/rockchip-iommu.c:1029:35: error: 'rk_iommu_dt_ids' undeclared (first use in this function)
  np = of_find_matching_node(NULL, rk_iommu_dt_ids);

This removes the #ifdef and the corresponding of_match_ptr wrapper
to make it build both with CONFIG_OF enabled or disabled.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 425061b0f5 ("iommu/rockchip: Play nice in multi-platform builds")
Reviewed-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Arnd Bergmann 2015-04-10 23:58:24 +02:00 committed by Joerg Roedel
parent 1bf1b431d9
commit d9e7eb152b
1 changed files with 1 additions and 3 deletions

4
drivers/iommu/rockchip-iommu.c
View File

@ -1004,20 +1004,18 @@ static int rk_iommu_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_OF
static const struct of_device_id rk_iommu_dt_ids[] = { static const struct of_device_id rk_iommu_dt_ids[] = {
{ .compatible = "rockchip,iommu" }, { .compatible = "rockchip,iommu" },
{ /* sentinel */ } { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, rk_iommu_dt_ids); MODULE_DEVICE_TABLE(of, rk_iommu_dt_ids);
#endif
static struct platform_driver rk_iommu_driver = { static struct platform_driver rk_iommu_driver = {
.probe = rk_iommu_probe, .probe = rk_iommu_probe,
.remove = rk_iommu_remove, .remove = rk_iommu_remove,
.driver = { .driver = {
.name = "rk_iommu", .name = "rk_iommu",
.of_match_table = of_match_ptr(rk_iommu_dt_ids), .of_match_table = rk_iommu_dt_ids,
}, },
}; };