lkml.org 
[lkml]   [2018]   [Mar]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v8 01/14] iommu/rockchip: Prohibit unbind and remove
    Date
    Removal of IOMMUs cannot be done reliably.

    This is similar to exynos iommu driver.

    Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
    Reviewed-by: Tomasz Figa <tfiga@chromium.org>
    Acked-by: Robin Murphy <robin.murphy@arm.com>
    ---

    Changes in v8:
    Rebase on newest for-next.

    Changes in v7: None
    Changes in v6: None
    Changes in v5: None
    Changes in v4:
    Rewrite commit message.

    Changes in v3:
    Also remove remove() and module_exit() as Tomasz suggested.

    Changes in v2: None

    drivers/iommu/rockchip-iommu.c | 21 +--------------------
    1 file changed, 1 insertion(+), 20 deletions(-)

    diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
    index 6a3719e118da..e7fb824d123e 100644
    --- a/drivers/iommu/rockchip-iommu.c
    +++ b/drivers/iommu/rockchip-iommu.c
    @@ -1197,18 +1197,6 @@ static int rk_iommu_probe(struct platform_device *pdev)
    return err;
    }

    -static int rk_iommu_remove(struct platform_device *pdev)
    -{
    - struct rk_iommu *iommu = platform_get_drvdata(pdev);
    -
    - if (iommu) {
    - iommu_device_sysfs_remove(&iommu->iommu);
    - iommu_device_unregister(&iommu->iommu);
    - }
    -
    - return 0;
    -}
    -
    static void rk_iommu_shutdown(struct platform_device *pdev)
    {
    struct rk_iommu *iommu = platform_get_drvdata(pdev);
    @@ -1234,11 +1222,11 @@ MODULE_DEVICE_TABLE(of, rk_iommu_dt_ids);

    static struct platform_driver rk_iommu_driver = {
    .probe = rk_iommu_probe,
    - .remove = rk_iommu_remove,
    .shutdown = rk_iommu_shutdown,
    .driver = {
    .name = "rk_iommu",
    .of_match_table = rk_iommu_dt_ids,
    + .suppress_bind_attrs = true,
    },
    };

    @@ -1266,14 +1254,7 @@ static int __init rk_iommu_init(void)
    platform_driver_unregister(&rk_iommu_domain_driver);
    return ret;
    }
    -static void __exit rk_iommu_exit(void)
    -{
    - platform_driver_unregister(&rk_iommu_driver);
    - platform_driver_unregister(&rk_iommu_domain_driver);
    -}
    -
    subsys_initcall(rk_iommu_init);
    -module_exit(rk_iommu_exit);

    MODULE_DESCRIPTION("IOMMU API for Rockchip");
    MODULE_AUTHOR("Simon Xue <xxm@rock-chips.com> and Daniel Kurtz <djkurtz@chromium.org>");
    --
    2.11.0

    \
     
     \ /
      Last update: 2018-03-23 08:42    [W:5.451 / U:0.268 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site