From patchwork Fri Oct 26 14:49:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 149595 Delivered-To: patches@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp862309ljp; Fri, 26 Oct 2018 07:49:19 -0700 (PDT) X-Received: by 2002:a19:a90f:: with SMTP id s15-v6mr2339274lfe.154.1540565359394; Fri, 26 Oct 2018 07:49:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540565359; cv=none; d=google.com; s=arc-20160816; b=rlaQrvf+FfUUmAwlJGQnF/gJYgoG08nriyHErq2PWIOpkgUkJSwMwzq1hAP7jYEAAg EYL6P3BDOTbVDupWHn51rmKBrcRvXa7czLs/uxBbq6w3QCHoNuMDq6oCibpRu3jZggyK os/OEmTJjQqozt6YSiqPWtaTj5iB903r7UqD5nU6L2dU3IusKwYkOnOaCVGJo7i+xyS7 kt2ve2GXMkyMD+qWal4VLtlQiP0DiqWyEkNkcc0wfg/t/DQZUH4EbxGfZAkyidOfIL0U FGmZj7aGCm/j5oIZAbreQs7ObP/LzMdIwgdwCojpmOp3hRxJJqRJK/qRMZBiB7o1JjaF BlYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=GDzx2amcYNP2obVohHmOjZaG31lczXSumUP51GLA9sc=; b=zTkWOqSNq0o82MYs5GsSYVTH9y1wyzFSoR9nt8KVwDrpdBZ1Sr+Dd3ADQ5pvn177yn SfRgGf1AOkbpJqtI/2N81f69Lz1x8ENnthXgJALjsIXIXgK9Miriy91xsBl6b2+fEnES aLCFngLoLuIAM+GXDlExm42VMhDfm/uu+yp+eE5MXtShj7g428mfU9/ukdYkJHhtBVsQ iljivujFp//t5Ebq+tzUrawSmBvTcBICUNE/4bcQw38dSL4NdJ8FyyC6cRFjTgL3fpxv ll5WpfPuWrsZJ7lJ1mAVDATNa5nvEUZgWBJnogh9Kb2RR/mD4C4MaoOvZqJKMO8xEPYj Y71Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bvSXOH7a; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id o24-v6sor7769268ljj.4.2018.10.26.07.49.19 for (Google Transport Security); Fri, 26 Oct 2018 07:49:19 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bvSXOH7a; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=GDzx2amcYNP2obVohHmOjZaG31lczXSumUP51GLA9sc=; b=bvSXOH7aI4KsNojy98L+l3uoIV6kHNwM50ViMutnnVPJ6RTLsr+uoQ3ariFz4GyVrR NzNAhB8UFJlX1DloU7aqMDk3xjuQs4lkDgyOrhJ1q7eB3BA1N9z3LL8jR6QT3nwI8j5v RBEuTxy0BGOBQLG6xfTa7QYXnAcJh5SqBquMk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=GDzx2amcYNP2obVohHmOjZaG31lczXSumUP51GLA9sc=; b=SHXIx/Pa9NZBF7VF+SST0fmiQJ2O/GrvGcOGt+40T4WJQds8dem8+cJ/HIcu10yAp1 y+QYLl7+cNVk3fs9/tvBRWFq+r/I1Fsg6GQ2mJVz9f4ZuxQuLsKpGdYgF/uRcaG9ws8K wZErGixWsfRfYv4me7izfjkSKG06lOx1lrZTmk5yYmdmKJyOx7bSfOQ2mhicLFToi+Ev OjluzyKBJUWsh6Xa/tROYbyx1zYlhp6uBuTpz179s4pKtpaJ00Ucv6fqWdDTEOYzqg99 ZIKRVYN5yRfZYkI3GD6pPkLRCE8u/eCfRt7MjZni1qbL4AEA0VHJDQl/YkPZNBM8fiuh ZVkQ== X-Gm-Message-State: AGRZ1gLDfkvQPcb3mWq4lnbNb+xgXxj3A9ao5CQeTd8OnhvOIOOwIA+B bnss1r7a6uywC3EwA2+JuDtvJ2ZKQ0hLTQ== X-Google-Smtp-Source: AJdET5cokrcujRqEjuFu+g4rhFaZWRVRAW1vrDnp7tDYX/C62AH6TWQlRc8fn60wQmWCIrOr7U7Ymg== X-Received: by 2002:a2e:8684:: with SMTP id l4-v6mr2825348lji.52.1540565359067; Fri, 26 Oct 2018 07:49:19 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id i2-v6sm302118ljc.94.2018.10.26.07.49.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 07:49:18 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , Daniel Lezcano , linux-pm@vger.kernel.org Cc: Sudeep Holla , Lorenzo Pieralisi , Lina Iyer , Ulf Hansson , Vincent Guittot , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 2/2] ARM: cpuidle: Convert to use cpuidle_register|unregister() Date: Fri, 26 Oct 2018 16:49:15 +0200 Message-Id: <20181026144915.3084-1-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 The only reason that remains, to why the ARM cpuidle driver calls cpuidle_register_driver(), is to avoid printing an error message in case another driver already have been registered for the CPU. This seems a bit silly, but more importantly, if that is a common scenario, perhaps we should change cpuidle_register() accordingly instead. In either case, let's consolidate the code, by converting to use cpuidle_register|unregsiter(), which also avoids the unnecessary allocation of the struct cpuidle_device. Signed-off-by: Ulf Hansson --- drivers/cpuidle/cpuidle-arm.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) -- 2.17.1 diff --git a/drivers/cpuidle/cpuidle-arm.c b/drivers/cpuidle/cpuidle-arm.c index df564d783216..3a407a3ef22b 100644 --- a/drivers/cpuidle/cpuidle-arm.c +++ b/drivers/cpuidle/cpuidle-arm.c @@ -82,7 +82,6 @@ static int __init arm_idle_init_cpu(int cpu) { int ret; struct cpuidle_driver *drv; - struct cpuidle_device *dev; drv = kmemdup(&arm_idle_driver, sizeof(*drv), GFP_KERNEL); if (!drv) @@ -119,33 +118,12 @@ static int __init arm_idle_init_cpu(int cpu) goto out_kfree_drv; } - ret = cpuidle_register_driver(drv); - if (ret) { - if (ret != -EBUSY) - pr_err("Failed to register cpuidle driver\n"); + ret = cpuidle_register(drv, NULL); + if (ret) goto out_kfree_drv; - } - - dev = kzalloc(sizeof(*dev), GFP_KERNEL); - if (!dev) { - ret = -ENOMEM; - goto out_unregister_drv; - } - dev->cpu = cpu; - - ret = cpuidle_register_device(dev); - if (ret) { - pr_err("Failed to register cpuidle device for CPU %d\n", - cpu); - goto out_kfree_dev; - } return 0; -out_kfree_dev: - kfree(dev); -out_unregister_drv: - cpuidle_unregister_driver(drv); out_kfree_drv: kfree(drv); return ret; @@ -176,9 +154,7 @@ static int __init arm_idle_init(void) while (--cpu >= 0) { dev = per_cpu(cpuidle_devices, cpu); drv = cpuidle_get_cpu_driver(dev); - cpuidle_unregister_device(dev); - cpuidle_unregister_driver(drv); - kfree(dev); + cpuidle_unregister(drv); kfree(drv); }