From 3396f59b2f8b4fc2457ac01e4f5bec59c4874a1b Mon Sep 17 00:00:00 2001 From: jixj Date: Thu, 29 Oct 2020 14:33:12 +0800 Subject: [PATCH] Revert "(CR): utags.ko: force this module unloadable" This reverts commit 298e2347dfc445415663afbfc2ff1e8e7053a905. It is not needed anymore because remove_proc_subtree has been added to GKI whitelist Change-Id: Ieee190e012ab338b613c81358298a86443d6944b Reviewed-on: https://gerrit.mot.com/1788233 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- drivers/misc/utag/utags.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/drivers/misc/utag/utags.c b/drivers/misc/utag/utags.c index d76f340639f7..cf0599b91725 100644 --- a/drivers/misc/utag/utags.c +++ b/drivers/misc/utag/utags.c @@ -1961,11 +1961,6 @@ static int utags_probe(struct platform_device *pdev) struct ctrl *ctrl; char buf[UTAGS_QNAME_SIZE]; - if (!try_module_get(THIS_MODULE)) { - pr_err("Failed to get this utags module\n"); - return -EIO; - } - ctrl = devm_kzalloc(&pdev->dev, sizeof(struct ctrl), GFP_KERNEL); if (!ctrl) return -ENOMEM; @@ -2010,12 +2005,6 @@ static int utags_probe(struct platform_device *pdev) return -EIO; } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,4,0) - /* force this driver to be unloadable because the proc tree cannot - be removed in GKI 5.4 */ - module_put(THIS_MODULE); -#endif - if (!strncmp(ctrl->dir_name, HW_ROOT, sizeof(HW_ROOT))) ctrl->hwtag = 1;