From patchwork Thu Oct 27 18:02:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rafael J. Wysocki" X-Patchwork-Id: 11906 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp378703wru; Thu, 27 Oct 2022 11:04:17 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4EBIxrDN51P3+QGP+BAFlwU2rptUiPfUJk49r1EJWSPDcl3YCR0OR3zCNw/rmKAtIzLCvh X-Received: by 2002:a17:907:728c:b0:78e:2856:7fed with SMTP id dt12-20020a170907728c00b0078e28567fedmr43282954ejc.2.1666893846078; Thu, 27 Oct 2022 11:04:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666893846; cv=none; d=google.com; s=arc-20160816; b=dwr63hCLxBTSgtYWBKri1wRD8GhoOgHL7N47UmtMOVbrUMcIILDXLdp9gtRgf+EpWU dZG5MjDEuqUqUekhWD8g4Kw5QMX8mO+43PXVjHDF+qyuXLqpWXoAWBnA7dkWkbFwcn2U guUk8XhXwJ7VasTPvsqyjfdnafFu3lq+LMMEzorT6WPVmzQaG8DHs3hikONCPfpFJ5+n OlXJqDSNJEzHUBAdEvul0NGwoYq4O39o/QebM0zgUNemwBTZC/qCxer4nTdtHILgCZP8 DxSZcJo1VoXx7/BCoqtRfWxMm7c52oxVPD+0CFPGQjn8LwDgKJSWYca+kCEbK8xSpbtF YeLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=GwRrYMV5dePgGYLYQn6mKrK5ORr4BU9XXrdFTi473Q4=; b=qxiXoJWt2aFdfH5xWv9wOImRB+x9bXBcNgXKZAsEKKp2K1Wy6PfyuKSu7BUQ9Bo/EO TTGtpSfl2rQchonranAfR9HWd5KkBZMZmxU3uup56VdXnslX1PNztofRlfebDzQffdxu lXqzJ3K5YtOIZdhzvsEMsX6K2YtkB5swe5nns/SMwUb6vSSjBm7SfI1hkLuOFCxTlmCF EENfug/PtA1prBneN+AClJI1/icK84q3szRT3j+ouFfKHyaDyGtvTwxSUg4iMXMuECNz gb85vr2XsHzHdehoGPTo4x/7Rqb2+V95P2+nP3N6mnyGUCs1DaKlvijyyvEpEO5IbwaE AaRg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sg12-20020a170907a40c00b0078cba073ec3si2411813ejc.734.2022.10.27.11.03.41; Thu, 27 Oct 2022 11:04:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236284AbiJ0SDG (ORCPT + 99 others); Thu, 27 Oct 2022 14:03:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236409AbiJ0SCm (ORCPT ); Thu, 27 Oct 2022 14:02:42 -0400 Received: from cloudserver094114.home.pl (cloudserver094114.home.pl [79.96.170.134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01EA3F1F; Thu, 27 Oct 2022 11:02:15 -0700 (PDT) Received: from localhost (127.0.0.1) (HELO v370.home.net.pl) by /usr/run/smtp (/usr/run/postfix/private/idea_relay_lmtp) via UNIX with SMTP (IdeaSmtpServer 5.0.0) id 4f39f533eb87d10b; Thu, 27 Oct 2022 20:02:13 +0200 Received: from kreacher.localnet (unknown [213.134.169.45]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by v370.home.net.pl (Postfix) with ESMTPSA id 48A0066D838; Thu, 27 Oct 2022 20:02:13 +0200 (CEST) From: "Rafael J. Wysocki" To: Linux ACPI Cc: Bob Moore , LKML Subject: [PATCH] ACPICA: Make acpi_ex_load_op() match upstream Date: Thu, 27 Oct 2022 20:02:13 +0200 Message-ID: <2133883.Mh6RI2rZIc@kreacher> MIME-Version: 1.0 X-CLIENT-IP: 213.134.169.45 X-CLIENT-HOSTNAME: 213.134.169.45 X-VADE-SPAMSTATE: clean X-VADE-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvgedrtdeggdduudekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecujffqoffgrffnpdggtffipffknecuuegrihhlohhuthemucduhedtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvfevufffkfgggfgtsehtufertddttdejnecuhfhrohhmpedftfgrfhgrvghlucflrdcuhgihshhotghkihdfuceorhhjfiesrhhjfiihshhotghkihdrnhgvtheqnecuggftrfgrthhtvghrnhepffffffekgfehheffleetieevfeefvefhleetjedvvdeijeejledvieehueevueffnecukfhppedvudefrddufeegrdduieelrdegheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpedvudefrddufeegrdduieelrdeghedphhgvlhhopehkrhgvrggthhgvrhdrlhhotggrlhhnvghtpdhmrghilhhfrhhomhepfdftrghfrggvlhculfdrucghhihsohgtkhhifdcuoehrjhifsehrjhifhihsohgtkhhirdhnvghtqedpnhgspghrtghpthhtohepfedprhgtphhtthhopehlihhnuhigqdgrtghpihesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehrohgsvghrthdrmhhoohhrvgesihhnthgvlhdrtghomhdprhgtphhtthhopehlihhnuhigqdhkvghrnhgvlhesvhhgvghrrdhkvghrnhgvlhdrohhrgh X-DCC--Metrics: v370.home.net.pl 1024; Body=3 Fuz1=3 Fuz2=3 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747864881684500980?= X-GMAIL-MSGID: =?utf-8?q?1747864881684500980?= From: Rafael J. Wysocki The acpi_ex_load_op() code has slightly diverged from the upstream implementation, so correct that to make the behavior consistent with the upstream and avoid patch backporting issues going forward. Signed-off-by: Rafael J. Wysocki --- drivers/acpi/acpica/exconfig.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: linux-pm/drivers/acpi/acpica/exconfig.c =================================================================== --- linux-pm.orig/drivers/acpi/acpica/exconfig.c +++ linux-pm/drivers/acpi/acpica/exconfig.c @@ -295,8 +295,8 @@ acpi_ex_load_op(union acpi_operand_objec target)); } if (target->common.type != ACPI_TYPE_INTEGER) { - ACPI_EXCEPTION((AE_INFO, AE_TYPE, - "Type not integer: %X\n", target->common.type)); + ACPI_ERROR((AE_INFO, "Type not integer: %X", + target->common.type)); return_ACPI_STATUS(AE_AML_OPERAND_TYPE); }