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: 10657547 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 001AE5A4 for ; Fri, 26 Oct 2018 15:01:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E336D2C9B2 for ; Fri, 26 Oct 2018 15:01:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D76F62C977; Fri, 26 Oct 2018 15:01:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 754C62C9C4 for ; Fri, 26 Oct 2018 15:01:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=ilB/FiXLj4eWktJUWvU3RIlM/Y982KCAMZ2wU0t+l6A=; b=IkG 64luQ3cRytZ0iQoFV3DNiZop0CVR0hu9AQMuN9Sf+ZpdtNgwHTmDHJIxDjRFLpr2cZoReYunIFJbn gPg/BVy3w2FQgyao8LAAiq584jFzkyXvjh1cMGwkjs2/+HXb9WHLXduJ0KqxYsXBNlEQGWp72GsYK tqHIT6KA3gVeoqgEJClKWWe9PdY+ZlS6L2xO0XQgbs1TxhTKCFi/J5TBb+OolTLUrLXoc1Y5jwYRZ L9uKYg7Onog1lhkkDAMvevpr+hIiOQrD4QZ8s7SyNar4mA3iEi3fkezoRvVRHmDtU22aEJKGPyB12 V2BVzNJEQbIiWug5ZEuaSaDBnqzWLJg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gG3cT-0002YP-Dq; Fri, 26 Oct 2018 15:01:49 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gG3bD-0001uc-ON for linux-arm-kernel@bombadil.infradead.org; Fri, 26 Oct 2018 15:00:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=GDzx2amcYNP2obVohHmOjZaG31lczXSumUP51GLA9sc=; b=U1tWTrQUCzEeLzdHUhrbfmXsB GLHAnG92MVaeuO/2qxypb/lh0H0n45rwiLtVyGpwNt1Z8+rhN/4OIrjdtjRIoo9Boy7aej7tYxhvR loaQJsK+nwrzCWjCGgXK+xCloHbyInxaX7H7iMZGwqAs7rM+3Ac129201+Xh+NWmeSXAQyTsqX0y1 dm0aQd5tY6vUHoIJV+nCIRR9jdhxdt8qUJ1rcJFGyK82u24UxKlMnVZraYvZF4hAg94z3eQrD1IbC Ff5vFZl9tJIPQAr63Qq34iQdRJT0iLDbBHcJ3L+nKz3enLO1QuVdfiFUgUbyTgQFqjZ2EgvP1Xlna Ucg4PjcKw==; Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gG3QY-0000Ar-Rc for linux-arm-kernel@lists.infradead.org; Fri, 26 Oct 2018 14:49:32 +0000 Received: by mail-lj1-x243.google.com with SMTP id j4-v6so1382503ljc.12 for ; Fri, 26 Oct 2018 07:49:20 -0700 (PDT) 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=Xe2TLCL5bsjeJtT7gS5Ho2Elbafxzqxdd7Os/GGhezPf78rvcTf3+ldfi6En/pfulM u8K106Nx9yFEdfW7hbMN36iZ9eK9TzR24hF2B9NveeBJLwICmb6AHkW7Bgv4EKZgmb5Y 488aURjukDgKuuNpv//L7pj0zGl+k/LapP4kDzQp5BOH3BfLSP0tbS7nzFaNVeQ6+dVe nJzmv/oE5M9UekkBPs1lIF/TR4hDvym9QTo8Z9CGWqG+mh+GDf+XNF4Azl50Jpj0Mu/W /p5dS5Ut00DqtkKFuYx/jUNJNqa/h73IUijL3A2Ar+QvE7U+NgGQCrvSCSQV6N28dMqv 1EVQ== X-Gm-Message-State: AGRZ1gIGhSgHvnUs24Z5CjGmAghMSxiSylEN7J60QjaMMzijcS4t7dW5 irxjt4rEUC+0epoOaU8WgoP2Ew== 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) 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181026_154930_882470_ECF6D214 X-CRM114-Status: GOOD ( 15.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ulf Hansson , Lorenzo Pieralisi , Vincent Guittot , linux-arm-msm@vger.kernel.org, Lina Iyer , Sudeep Holla , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Lorenzo Pieralisi --- drivers/cpuidle/cpuidle-arm.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) 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); }