From patchwork Tue Feb 6 22:04:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 13547852 Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DAA611BC20; Tue, 6 Feb 2024 22:05:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.22 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707257112; cv=none; b=SfuelkJ9/kMJOs63q6FGkmh1RlwFNN7O1x11nc/B3CPjEVwoKxC+K3Wvp2cxFGH+0tCcf38XkSxDxcoVcKHu77bdZqNq8IS15HKw2ZiP3Dva4ruLSevTkmPZvUfBB2hOrDA2BrpPaVQJKUhNuVC/mcpaGWEsRnCez+ZhBpmcU80= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707257112; c=relaxed/simple; bh=NDUyZqbfNLTQiXuIWY2WA7uhM6lD4SItVlaGr+B6T6c=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Wyg5u2rdpdAguYifYzEEBc+NbLhdLnHaCnz/HT3uy7HlIayu1RZLYGC2H4sIZ1aK/gOfeeODptFfXKbPY7qCQry3hJ0kibB3yEMJji408hVVf6y/X3b++hrDvOZR4g58otIzsds0N3LO+2vfrMo0bYHyW6Wdk5aYZmKVGlKOKEk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.de; spf=pass smtp.mailfrom=gmx.de; dkim=pass (2048-bit key) header.d=gmx.de header.i=w_armin@gmx.de header.b=uLEsDdvr; arc=none smtp.client-ip=212.227.17.22 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmx.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.de header.i=w_armin@gmx.de header.b="uLEsDdvr" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1707257100; x=1707861900; i=w_armin@gmx.de; bh=NDUyZqbfNLTQiXuIWY2WA7uhM6lD4SItVlaGr+B6T6c=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=uLEsDdvrcWRVnhprP0UrgsrOsPalld2E1M0JcDieRGAJE5iYgZFxebXpdoCKYGaa AY0rBZdVEcU2rE0bn+/3FRan0EhtaXDzcX5ypU4lqkWOzV2A+Rgc/6x/a/ejo54YF Mu1RXzzl9mm1NU4CbOOOCwvVVi1okaudIg6pX8AtLI0lDfWjNGor3RNcThusbbuOj /xZqwtm9a16JG0bm353QkX8RZY3ruITBVw/K1VpCvnAb+YPvuNs6GUwCsLX6tZYBt 4ZExq3KGEODLs53Smw1RnkeEEHhOOQ6j1hdsJAFSzU8RRl5fXTxjxFCKz9CrGT/8b 0NfeIlguRXKiSCLA2A== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from mx-amd-b650.users.agdsn.de ([141.30.226.129]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Mof9F-1rDmwX0YXp-00p6ut; Tue, 06 Feb 2024 23:05:00 +0100 From: Armin Wolf To: hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] platform/x86: wmi: Check if WMxx control method exists Date: Tue, 6 Feb 2024 23:04:44 +0100 Message-Id: <20240206220447.3102-1-W_Armin@gmx.de> X-Mailer: git-send-email 2.39.2 Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:EbPnQIq2qjLcvrZhzs/4oVtEcQuSYO+IVBIrKFXPD+2vHJScH+4 JecIMfiItoB59RQS5tN06+d/4reTYJVaYLgvUurGl5Pg24f1/VqZMcurTYuqS72kGUUB2u9 yJ8LJyTkMN4aaSa8/cBdxXqXOugWhJjg9ufamjpXcuPV4jQeb2BuLtSRoNOghEnbGZN4S5/ sSm3ArutxrZganvGU1qNQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:9k1+nBJUUnc=;8RH+2D2XDGPEx8aG+E9Xmp2k46V V/eh78PXdd72aGRQm9ypNrAB3mLEh2c7zKrmifctM1rIIu4L9g4TqAKPyU4TFdPKQTPmXVEML 4FL20ssIeP23bVlZwYyyJkBEj2Q642Om2wfswzRiF8NeMDEZOnIil+XlznbQZUzCqPcnsHYfH TLvNlftj+dNLUzq+Px8vnPi3cqCQvv5DDsIQrIxusYaXohBA/eCsjBrbWYspSG1xRQp5UseP2 AacNnFYv+EDhoyCbN8HKVHK5EDyoipSP9DpHSRQfvbAstV09rMazAXq+aEG+8mHOzfcgjykQR /6rN2OsU/zaEw8SnsvO9luyIFeEM3vlOFnzl1r4Nx/922aUMdtdI+GdGSKFA0Yq8YK/htdQYm sxs/9hl4cNs1g1c16i4ed+04ltxk9HjOk83+NXxTOaZeDoJf81io1LVMuz17jxbsNdl9qHREH mqqOjHtgBEaeetMEf3/1lR3yoN+7+5OMiH5fQp64ryoJZqOb6lEdETSCtWlbWsm+4gW9JRMr8 aSN/MlC81exJEkjzSay7q2siakWgbN9ApWWR0UJMuZ7ITgbtHVZivRvXH57IO6EwENqa6fq9R 9DB8C9joMLcn7EEUhjTFrQ1kxYHkS+iMw9N4tw0nsUwJBJH1l9LuebUxfZ4OFO7PZyPpQ+Dno 5gvEOUV43CRHnjHCQ1bmLEhITtog/byFsfEK+SOMRqriRAN6TO7zSbRswV29Pbj1aFcLYCIQR J9uMbt/uu0PRlkuNRNx+ztFn2n51l9sff9pktsJvfGn2MBa3r5mRNCW9GgCGd/MTPWqlPi7mo 8Zb9XX0wW9wEgtT/i3QLX+0HOoJmYcGafhSs2l9DzymW0= Some devices like the MSI GF63-12VF contain WMI method blocks without providing the necessary WMxx ACPI control methods. Avoid creating WMI devices for such WMI method blocks since the resulting WMI device is going to be unusable. Signed-off-by: Armin Wolf --- drivers/platform/x86/wmi.c | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.39.2 diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index 3c288e8f404b..9d544c85e5a8 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c @@ -990,6 +990,15 @@ static int wmi_create_device(struct device *wmi_bus_dev, } if (wblock->gblock.flags & ACPI_WMI_METHOD) { + get_acpi_method_name(wblock, 'M', method); + if (!acpi_has_method(device->handle, method)) { + dev_warn(wmi_bus_dev, + FW_BUG "%s method block execution control method not found\n", + method); + + return -ENXIO; + } + wblock->dev.dev.type = &wmi_type_method; goto out_init; } From patchwork Tue Feb 6 22:04:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 13547853 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5AB111BC30; Tue, 6 Feb 2024 22:05:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.15.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707257112; cv=none; b=E3u0lXqjoBvYiaicoiw3u0uzUCmnQV6qoPG+J7PnChB0sVlKNRPIu24e1GLUA7Wgi1/Pwes7Ybf0VyzQutxKzKh291/bZ62jGA75yLgE1/zD0SLtDa91xKYCAV0cmgHk6yiALpRqD5HxYspG+Wo0mIx80IwKFsZ4wSFKPpZnp+o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707257112; c=relaxed/simple; bh=YBOlzgKtDMyIfKshatb5mZPaRTlCvs+Ik0B0XiYSl0E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cvdt6BZHm5e8PeEvY/sAzuxnOop+ar7yyVXydg2B7F/EEjdJQyj2QEOTd7U9xj0EYDDABhm43fEdK1ydYH1sYAMEaIaktnWwxDy0Sf7iOJcc1jhp00manr6NxM8tLgEQJH/wiOUoc/jSsbo2X+wPrSythML+uanAEaga3OrgKpE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.de; spf=pass smtp.mailfrom=gmx.de; dkim=pass (2048-bit key) header.d=gmx.de header.i=w_armin@gmx.de header.b=R+CIzvPJ; arc=none smtp.client-ip=212.227.15.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmx.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.de header.i=w_armin@gmx.de header.b="R+CIzvPJ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1707257102; x=1707861902; i=w_armin@gmx.de; bh=YBOlzgKtDMyIfKshatb5mZPaRTlCvs+Ik0B0XiYSl0E=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To: References; b=R+CIzvPJcnB6k0Ob/X3LYMzXw75VcSoB0fWXvwIWdAc9Ou8/lgk5SRnEozUmc0Ui WXguSi5ihsIb+JbzPPWJ5IXJpW4BSSDjcho2+0GtNb5eC5yEGiNf1QZDfsyPNWgFH Mlf0DZQxpNradPhLXpFSQXWRdnDSt8zX93qSWp+2g75v3Dibh03bgZqaaIweBzCeZ aXeWJ4dlqU2OB7KzMiavVhozySbNYNV7Epl2gsovE2R7F5WTa+08xOZ+MZVKCMkWe OsFxLeDD2zvAaWg8TO9DLa7FZqO5skCydOkQ0oVudCu0PrZGIT5KyMGrNPrfTBFNL B1l6W107z44OYWfpcw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from mx-amd-b650.users.agdsn.de ([141.30.226.129]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MdvmO-1qygm03PHS-00b6qU; Tue, 06 Feb 2024 23:05:02 +0100 From: Armin Wolf To: hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/4] platform/x86: wmi: Use FW_BUG when warning about missing control methods Date: Tue, 6 Feb 2024 23:04:45 +0100 Message-Id: <20240206220447.3102-2-W_Armin@gmx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240206220447.3102-1-W_Armin@gmx.de> References: <20240206220447.3102-1-W_Armin@gmx.de> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:xsnmaZxeuG9ddF4HDj+QsOlnZD4yimW1Y6akEJN8yys8VKBUiiI 4q5Z8t6yeou6Z0msdKhCTRMXG4w+XA/t4t493ZtU0HjS/OrPbxJru18+75IhojepYjCkE2U +J9v/bRTKZBVxZuPUDGTiFUhFAwId+gLi9lmDNEO9fkzbE3QKD7XNTm1MBf8nbv/6EcV8Gz cIGwF5jMym2UqMUfJbr0w== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:d5RavgR5U4k=;pfOK4XPpO33tSCRC7M9m4bi9kFK rPrlyF25/eHhz8Sibr6/q/p4FL4rLAoRb2Le/YPGyelCJTxa5N9j/m+yQrKuE4JFiZ409d9JU e7cZA5FBc1ZdpKoeLSKs/pFVF75crO0Huhg5t1kBOjQrPTEl/22cXKp5jz7XMZM2aCc/wfwwa GdeWivrKymAC0pxigQ/jZWVB7Vf8qZSgLzKA1srEk8fasm72Jmr5KTDp787ydMRXH0/wfAAVi 5uXZg5RfHCm/SrOpPykmmaZvQVoCjdUqpBqUMdqR76tT4cYUtm1Uj/9pxgB0Gm2rV5/aXBefB SdFk3TLF1j1L2cW356JjIK9aq/39buWAa6qwn2h3ZAGABjsh4JtZ4obe3XEZMgXZdUsmEdKLv lBaHn6A76O60IO+5eXcFcU7pmzyGXlasYDGeMDyewl4pxF++eITb8OfSNCPmhVntM/zkTAjaX XNO1Ij5EA3GF/4oB7nbkf3Qdiu/6OaNf+zeawVn5mYd+hJU5YvDizQTfCp1cpeSQlH8R9w0sz L8oCAIHNzUa9p16VwQOCTJMcLOWgTyFt2uDBE7UtlOYfOWki5eH6ltKaLrUjJ6HHQDCNNA6h5 V4/wnkutuSf3qowmzP4Z11aQ8QWrlflRg74zqnVqRa7FZxwHU3B1YhLYlfEB4rGLPHayz7Gtf heyCtPqXv8tCWHNbwuAh50TNyObEJdikaly3GRVLtPVPs1M+WB6ZLNU9gMBX2WdwyYXXE2XdS 5A2kAsO4N0NYt/rXYuLsKraoxkh8KXsJalCWky2tTJm88G3GIk3volj4yU/T+cifwycLnNbXm SFxTNFax5DgWMagXUV20LKr6O5L5NHRKz0Tvt2+nK7Ask= A missing WQxx control method is a firmware bug and should be marked as such using FW_BUG so that users know that the issue is not a kernel issue. Since get_subobj_info() might fail even if the control method is present, we need to print the warning only if acpi_get_handle() fails. Signed-off-by: Armin Wolf --- drivers/platform/x86/wmi.c | 39 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 27 deletions(-) -- 2.39.2 diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index 9d544c85e5a8..545d6696d7cb 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c @@ -132,26 +132,6 @@ static const void *find_guid_context(struct wmi_block *wblock, return NULL; } -static int get_subobj_info(acpi_handle handle, const char *pathname, - struct acpi_device_info **info) -{ - acpi_handle subobj_handle; - acpi_status status; - - status = acpi_get_handle(handle, pathname, &subobj_handle); - if (status == AE_NOT_FOUND) - return -ENOENT; - - if (ACPI_FAILURE(status)) - return -EIO; - - status = acpi_get_object_info(subobj_handle, info); - if (ACPI_FAILURE(status)) - return -EIO; - - return 0; -} - static acpi_status wmi_method_enable(struct wmi_block *wblock, bool enable) { struct guid_block *block; @@ -979,9 +959,10 @@ static int wmi_create_device(struct device *wmi_bus_dev, struct wmi_block *wblock, struct acpi_device *device) { - struct acpi_device_info *info; char method[WMI_ACPI_METHOD_NAME_SIZE]; - int result; + struct acpi_device_info *info; + acpi_handle method_handle; + acpi_status status; uint count; if (wblock->gblock.flags & ACPI_WMI_EVENT) { @@ -1009,15 +990,19 @@ static int wmi_create_device(struct device *wmi_bus_dev, * we ignore this data block. */ get_acpi_method_name(wblock, 'Q', method); - result = get_subobj_info(device->handle, method, &info); - - if (result) { + status = acpi_get_handle(device->handle, method, &method_handle); + if (ACPI_FAILURE(status)) { dev_warn(wmi_bus_dev, - "%s data block query control method not found\n", + FW_BUG "%s data block query control method not found\n", method); - return result; + + return -ENXIO; } + status = acpi_get_object_info(method_handle, &info); + if (ACPI_FAILURE(status)) + return -EIO; + wblock->dev.dev.type = &wmi_type_data; /* From patchwork Tue Feb 6 22:04:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 13547854 Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B94161BDE2; Tue, 6 Feb 2024 22:05:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.15.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707257113; cv=none; b=o+mH/UCHFbKzmCjAkmfJOQLUiDXfWtEPsMFALHfeNfHdBX3fryhrvENHJJAiNQOpiohr/qksTdBnRTzNKmKSxYUaKA3rJD925lmgsFw+/XHHEmMujE9G6ZHO2n8xpH0hVmQ5AcjOahympBuft8/YCzhPGvp0mnBKsZuluMfHKh4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707257113; c=relaxed/simple; bh=B23gbhjfbUKpvpzjOifemm6xIDpwsf1gr++jrmLvLaY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Jd7cpKvw5WhKoFBvkOSTuy8F5BqEZVs9KqV2iv/qjn9oky3uwVp9PSVWomgS8oQLL3DxAONy8Fx48JUHriCVOGP8nxVAhqH2zR41/EUcG/vb0uHJrjVRbkfTGeQzLOyEfdCHGZOw4dGWy7NYM2u0GK5OkuFETmaoaWpk7FN1jsg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.de; spf=pass smtp.mailfrom=gmx.de; dkim=pass (2048-bit key) header.d=gmx.de header.i=w_armin@gmx.de header.b=Qyf+1Aln; arc=none smtp.client-ip=212.227.15.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmx.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.de header.i=w_armin@gmx.de header.b="Qyf+1Aln" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1707257104; x=1707861904; i=w_armin@gmx.de; bh=B23gbhjfbUKpvpzjOifemm6xIDpwsf1gr++jrmLvLaY=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To: References; b=Qyf+1AlnXKU817YWeKjQSW/V4LOVUzwv2B9Yv7g3DQrkFfm40gx2hIyCEvlKBp3y xysKtaCKKLoFcI80GVApyqVx8EirSCqUDiL8YlCsQi4qHbcZlYJfJKg6e9K1imOsT WZ7VN9XZ+6oI8P78xi1eFPOXwhrP8XlkB/4EBWmgNTy0+i1xBMq2D6vpENAqNd7yW NkcEWVq4PUyXAYrV68tCCkBqZ/vS9q2CQRNcLFBeYcd6VcQaaMOlCJ7UgK1POPxWX 8KqcD+kSgAPAb6LRHKKSINrB7Ts5BrMxJYfnzOtsZmyD5F1f561BPXT6AvfPsbf35 DmxrRpaucAFGnPBL+A== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from mx-amd-b650.users.agdsn.de ([141.30.226.129]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MTABZ-1rRixj1hz5-00UesZ; Tue, 06 Feb 2024 23:05:04 +0100 From: Armin Wolf To: hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] platform/x86: wmi: Remove unnecessary out-of-memory message Date: Tue, 6 Feb 2024 23:04:46 +0100 Message-Id: <20240206220447.3102-3-W_Armin@gmx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240206220447.3102-1-W_Armin@gmx.de> References: <20240206220447.3102-1-W_Armin@gmx.de> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:f9SK+HvH8lNvtSB2c5q7kMi7Z6Z3bX/r7F5VCvPB80HyxzoKwhE onKmlgkxvI4n0ozaDg9R/MJ4T9Xk5Z1fTZU5NTnz6UG8r9H5zEezC2Rg+rpKDlzS+/TjdQj UL81J9W2Q1biMonLk5h/7+QywYKXlorZ1SC6MXxNXOPy/o1kTkIGg9kULDP5oO1teagDQ/1 K+m7y9KEU6RlpzNp2yrTA== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:sNu2xG2HF8Q=;49cTGIuGzKgX1nRsSbkqEk2AdrY WCIiBUJ5rgWmboCJW7p7ImpvPOkpmaM3CqRlOViF1/0CheNQyAkmPtdy0L9QPA1OBm5pGCe0F x3nhzQVQqxD76iXxWNnjBO7YcBWMgA5vjjr5Cm3SGf+a3Lw2AzmE7yPMZSIYXVJFjaSsUkVj0 h3NvCdzWb2QqaJhZEZ/I3oq602hZOYwWAxWEle1RHCy2s1U8fDumEp+9wqCeHHTiPJxGkoYrV KN9xZqBHwQaKmRWSOkbClvolMGu0w+8Ve3I5Jkbmyo5/o3NQ9gQl5zj6JaAwIrzMp5VtfuHir ilOLZ7+duVrqp2annmlPS0lfaHYhjp/iKb9X6J8rDKJPSNU86VC5zmzyn0NSfklp5Ovs+/Q7N uhyzNZZAu6kvDdL42shZAGQ+SQL6RuiqqLDBr6CxVMm8N0HXd+SzvbL1UiTZxXOv0TuaDQpX2 2ujMh6bOB1JHXgeIGnOIhgzE/mpGHOJSuUN/sC7ToGuBOZhNrFxj71Gi0O6zCtREye1wwXYCZ S97gOUhe9dPX19AHpPeLy0AvmzMyLnylJ8sX2c2SAZAtwT8PAJ0V0TtDfy2i+AlrD4cX1lB3F xIUQmZo/HCO3DK8oMkfhdg5rIysIkAsfRUT+5DumAxExyGpnnaujkNZVd1cuc5LaDBHH7XLe1 2oi+4viGwO69wpzFzlGh3DxiPob5mXKSIPbpcLdqswu/jfRBLcJEhCztbvco/JZVX+FCQ1isw jRZPxD2Im4GbtbYV6xx4c5I/zpJTEuC0juzEn/fGusZv0cq5n7K6S9eQv4GfoaOGeY+Xna3CD CeyQWBMmLmOkl0FDfhn1EtsEv0oGQNZCAD5Wh5yTBpR/I= If kzalloc() fails, an out-of-memory message is already printed. Remove the unnecessary second warning message. Signed-off-by: Armin Wolf --- drivers/platform/x86/wmi.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.39.2 diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index 545d6696d7cb..396344523bce 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c @@ -1127,10 +1127,8 @@ static int parse_wdg(struct device *wmi_bus_dev, struct platform_device *pdev) continue; wblock = kzalloc(sizeof(*wblock), GFP_KERNEL); - if (!wblock) { - dev_err(wmi_bus_dev, "Failed to allocate %pUL\n", &gblock[i].guid); + if (!wblock) continue; - } wblock->acpi_device = device; wblock->gblock = gblock[i]; From patchwork Tue Feb 6 22:04:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 13547855 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1A7191BDE7; Tue, 6 Feb 2024 22:05:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.15.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707257114; cv=none; b=lr+QDmsxIg5TRnScmEV4EFNtD7G8eWFK/QTE/V/EFlk55U0veCxMeEfbLSlks5F4g9s4i4C5KQr5D6XdTtLy5+KUXko2/As7XzjS44hM6EOKcpEr//aHDJIc4udHDL9K5B9LFh11gD+7O6jSKLGCi7oAG+n2uG8P95xcgEK0IXY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707257114; c=relaxed/simple; bh=2PZ9F0FDkdVbqGbkUnpibkVEhoyYv+tqjfurNqK2CQQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YgP8KhEaapXQPWnswqxJQFePmARwLuBjhu5coCuMaEh9wywj89nXylanTsOz20xtCgH3HIbV/GbhCnknL7nvhVENSJK8rww/3QsMJXGNwWklE0nkEWhMNbzJufsqE2s540K+C03UWTfVxLD5OXjEN4w9FI26VSs0n7TOg05rscQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.de; spf=pass smtp.mailfrom=gmx.de; dkim=pass (2048-bit key) header.d=gmx.de header.i=w_armin@gmx.de header.b=MxWKY3jK; arc=none smtp.client-ip=212.227.15.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmx.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.de header.i=w_armin@gmx.de header.b="MxWKY3jK" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1707257105; x=1707861905; i=w_armin@gmx.de; bh=2PZ9F0FDkdVbqGbkUnpibkVEhoyYv+tqjfurNqK2CQQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To: References; b=MxWKY3jKu5UyB2iR5D3Qpo5+94ZcqcmJPPAEiQHkfZHInCNnyrL0+WNhMpSfa+SW sRq8sB0JYMJqgYs+usICt/8TpbbMqlB9/+OM4JtTbP99NqJXAwhQ3py9f+JIbpzh1 ZJ6YDRuX77jk7IzOdqO1s7TMN+U9Ipa15odjmsa8e23PYBEMO1D9CqmNSfmHJx4v7 /R1yeW5F/zQFVmRhRRQ+ov5pVFsU/tbMAZhd8FPImIfcMCGC8Fvy42g5CZyfRmnv3 TBBjTRdoS/PDv0rXBuLmv/oRaBqH9f9uxCV7A8k65r0KBeXyEQ3E8ht+WWv9B4M4z d3PKDeVSbfguD053ow== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from mx-amd-b650.users.agdsn.de ([141.30.226.129]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MSKuA-1rQu0v38p6-00SdAN; Tue, 06 Feb 2024 23:05:05 +0100 From: Armin Wolf To: hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] platform/x86: wmi: Replace pr_err() with dev_err() Date: Tue, 6 Feb 2024 23:04:47 +0100 Message-Id: <20240206220447.3102-4-W_Armin@gmx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240206220447.3102-1-W_Armin@gmx.de> References: <20240206220447.3102-1-W_Armin@gmx.de> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:sjpexojcG9PhmG/lOiKCA5maxHpxMZEgTZaPWlB9tq2zb8HGmDY zlAqeQl95KlNkQ1wItLe0qWIbeY9EcaIVIfhV3kgRCJ2VIqdaJhAnnteCsp/5bOIuqI/nNY q1OMxCzQmUKzbpaAsvzsDdOKFs30qpCrrXWIwTfDtMfQao/UbS1/tOknnIvPaldV2OIICDX t0Qp9kl8iUnzpjL7eZqJw== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:Tc5kJptXQpU=;/a1v9N+iZs6Y4ZYwWs/5ujvMmEe 3jpcwle5lBWYMfHu4D6xaejL0nw3LauiM4qKb+U5yjctQ1BRuEUBByuq8jrerwP4Jd6KAg5QB lX2OFKZrT1NmPA0tVuFF1IK5/kEPGbtNvKkg2bJeAjH+9/76WKZ4bPOQcsoQQ8/ckiHdSPq58 Mskvw8owdjdjOlpBjrNPNXP69zFcTwgz5cRuGitxb9w8Po1C8Fl+Knyr3K6+zk9TPIX0XvFqg MWoXbBFGFAwqIgmDa3JuDSh4f5KGX5nu5JUegOEMNuevtzcwsejCd5ngWecWA5HT6uAnYJfa5 kMnJIV9jhG+kQaDDmurzrGcXrbwXE3STOoFQdult8eBA6rrpedAf/QZVloZ3G9luDU5qlT5Uu L7MmfXyhPJjoVBgEq8BVLsuSFJvT67UlitPuf/L3oFwp6vRf7Mjtp+Pv6FSiKSMuMBrhx7fTb Bn9LUJozJNBJSyvoNTwTrgoWTM4H89DRY9ig/QLwDQHWcQ5sRw9aJFu2+UZk0QgPuY0X4vUi2 g9p0YeFGqrHoSgST3EJBLuyCsz6+vCNrEoWSiZRMcydbByc+aPixTnITsDX+y7kjQOQ/AGITI teRv84gQBAxE7xa4i8N8lS81oYjyQcbGhm5W0a3kBgGhQ612cbXBjStixbbbyLG6XsdUIYNzD XkAsY3a3urVyddjE5sSx4p0ebyyjCFiwleREsDlffP2KN/ISFH0JYUnIGmcu/tK4O3/q/4u6G 9PbBHRmgGFEOMI1qauQJ1ZiqIaqKnkIyv/kUf85V6qLHfefdUu7oEUR79x/2dJVmHIc+XfRF+ tFeeXK1VkukHH7U+2hVWMDNtD0gAB+XqEgVrLiGfn3AiQ= Using dev_err() allows users to find out from which device the error message came from. Signed-off-by: Armin Wolf --- drivers/platform/x86/wmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.39.2 diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index 396344523bce..63906fdd0abf 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c @@ -1339,7 +1339,7 @@ static int acpi_wmi_probe(struct platform_device *device) error = parse_wdg(wmi_bus_dev, device); if (error) { - pr_err("Failed to parse WDG method\n"); + dev_err(&device->dev, "Failed to parse _WDG method\n"); return error; }