From patchwork Tue Oct 24 15:16:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 157558 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp2014455vqx; Tue, 24 Oct 2023 08:16:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH8xS0UXD22UYlTtRXlhFeUAbZ8D8MyDlAp85oLp+qeEMcNUs0+/T4dNKjMhJ4TGqK8vJu6 X-Received: by 2002:a05:6a20:c19c:b0:179:fbd6:95f0 with SMTP id bg28-20020a056a20c19c00b00179fbd695f0mr2909122pzb.36.1698160610324; Tue, 24 Oct 2023 08:16:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698160610; cv=none; d=google.com; s=arc-20160816; b=XYr2SFg8WWTa5F+UKiFJqcOK+H6ByIvQCn364woxnzTyH5904uFj72WVzu0uw07T97 KHY42hiByVTzvw+QJXcE9mHLdIJk1sGHCJ9csUV2yJ/PIcydT/2K3bo6NUUysT0uB4p7 1VSbCZSZdUiwSjY3NJUrAgb/b5SMvZCsHMBtdADYeDbHvMJJNsCISURgndFDKLtat7ur 9BoV1m4TSEvRDWt0MFff1OfaQZRO+t/Oml2qkdK6XYmSy51Lx1BQde1+tWEsFNF0aZ/P qPgRGKeF1iA+mN+KnfqEJpCRnkdpDhsXzbrK7HPkaCt29hqd1k4RUTEmwUDgkNriAr4p bNlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:sender:message-id:content-transfer-encoding :content-disposition:mime-version:subject:cc:to:from:references :in-reply-to:dkim-signature; bh=4gqJUFEuje3fCbnl8mzHmlzSgskUoFHmtCeNWR/xAOg=; fh=SkTV5xOrq7hxTIOggvbIOXu+48dqXijvMNKji0VGfy8=; b=PX2P8PzdRDJNnzag8xH7zBPlo6+uXGBfhcA6g/zbDZmF/u3WwL6yw6vxxzw9IH2Mam KaYb1BOkVrQwMDetc+qeu8tHsFGt7W9wDywPf3OXkVxaVpWCz6yq2STpT8iq8eR4iJv3 NdEsWNd52Q0hOYS4TpWU0+1n0SBK+vckztcrxC/2260QtU/wizPeNfxS5XsbZRs40Qq3 HJgjucyhe626HBldZjwyOwOgH5dNfQnhZ4pjXFy6498L4SNZHxIWK0G08NA4EMbm4OMI woj5XrabMkWQnIxgHTV9o/s7np2QnQKktmIvn/yckPQ+qN5+CvBbZhQgnlcRC7+CyYHz cngw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail (test mode) header.i=@armlinux.org.uk header.s=pandora-2019 header.b="pXRu/zrS"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=armlinux.org.uk Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id u5-20020a656705000000b005ac4854b202si8357866pgf.321.2023.10.24.08.16.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 08:16:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=fail (test mode) header.i=@armlinux.org.uk header.s=pandora-2019 header.b="pXRu/zrS"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=armlinux.org.uk Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 0686580AC35F; Tue, 24 Oct 2023 08:16:48 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234671AbjJXPQk (ORCPT + 27 others); Tue, 24 Oct 2023 11:16:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234146AbjJXPQc (ORCPT ); Tue, 24 Oct 2023 11:16:32 -0400 Received: from pandora.armlinux.org.uk (pandora.armlinux.org.uk [IPv6:2001:4d48:ad52:32c8:5054:ff:fe00:142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E053DE; Tue, 24 Oct 2023 08:16:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Date:Sender:Message-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References: In-Reply-To:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=4gqJUFEuje3fCbnl8mzHmlzSgskUoFHmtCeNWR/xAOg=; b=pXRu/zrS/dM6ClNwUhatLM+tl7 JuF0cN93+EPgQNTCgK7I+R4kUezGWGlCR9kOPU/4+hNgzfQ6ZOm0PWZ2Zx1kUZadMSsRDUQ+kR3eI FwcxR+d06Bzs2MxjEmyjPvOnkah+I5WdsTSplkONSrI1sEQj8YOc1Tl9WV0eJ4RZs6c9BtJVUKouJ u1YOTdFsgTyuldtOdpSGW/9qNMJ2xfLA7x7XgVvvgJeTuBrk6NNdnyYayN24mc8/8NDzUqtTlI26f LYwHHpo8RBHZtEGBnKsoH2GUElaGo+p4MvORDwSn19oR7cJq/9JHOuAtD3gCKDzw0TvE3wAzTreRc sfIx2URg==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:43858 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1qvJ8p-0004Ll-0n; Tue, 24 Oct 2023 16:16:23 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1qvJ8q-00AqP4-NY; Tue, 24 Oct 2023 16:16:24 +0100 In-Reply-To: References: From: Russell King (Oracle) To: linux-pm@vger.kernel.org, loongarch@lists.linux.dev, linux-acpi@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-riscv@lists.infradead.org, kvmarm@lists.linux.dev, x86@kernel.org, linux-csky@vger.kernel.org, linux-doc@vger.kernel.org, linux-ia64@vger.kernel.org, linux-parisc@vger.kernel.org Cc: Salil Mehta , Jean-Philippe Brucker , jianyong.wu@arm.com, justin.he@arm.com, James Morse , "Rafael J. Wysocki" , Len Brown Subject: [PATCH 03/39] ACPI: Rename acpi_scan_device_not_present() to be about enumeration MIME-Version: 1.0 Content-Disposition: inline Message-Id: Sender: Russell King Date: Tue, 24 Oct 2023 16:16:24 +0100 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Tue, 24 Oct 2023 08:16:48 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780650460425136371 X-GMAIL-MSGID: 1780650460425136371 From: James Morse acpi_scan_device_not_present() is called when a device in the hierarchy is not available for enumeration. Historically enumeration was only based on whether the device was present. To add support for only enumerating devices that are both present and enabled, this helper should be renamed. It was only ever about enumeration, rename it acpi_scan_device_not_enumerated(). No change in behaviour is intended. Signed-off-by: James Morse Reviewed-by: Gavin Shan Signed-off-by: Russell King (Oracle) --- drivers/acpi/scan.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index ed01e19514ef..17ab875a7d4e 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -289,10 +289,10 @@ static int acpi_scan_hot_remove(struct acpi_device *device) return 0; } -static int acpi_scan_device_not_present(struct acpi_device *adev) +static int acpi_scan_device_not_enumerated(struct acpi_device *adev) { if (!acpi_device_enumerated(adev)) { - dev_warn(&adev->dev, "Still not present\n"); + dev_warn(&adev->dev, "Still not enumerated\n"); return -EALREADY; } acpi_bus_trim(adev); @@ -327,7 +327,7 @@ static int acpi_scan_device_check(struct acpi_device *adev) error = -ENODEV; } } else { - error = acpi_scan_device_not_present(adev); + error = acpi_scan_device_not_enumerated(adev); } return error; } @@ -339,7 +339,7 @@ static int acpi_scan_bus_check(struct acpi_device *adev, void *not_used) acpi_bus_get_status(adev); if (!acpi_device_is_present(adev)) { - acpi_scan_device_not_present(adev); + acpi_scan_device_not_enumerated(adev); return 0; } if (handler && handler->hotplug.scan_dependent)