From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 166F8C4321E for ; Thu, 1 Dec 2022 19:32:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231342AbiLATcV (ORCPT ); Thu, 1 Dec 2022 14:32:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231355AbiLATbw (ORCPT ); Thu, 1 Dec 2022 14:31:52 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A1BD93830 for ; Thu, 1 Dec 2022 11:31:12 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 24628620E1 for ; Thu, 1 Dec 2022 19:31:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0B5B0C433C1; Thu, 1 Dec 2022 19:31:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1669923071; bh=OMW+Gu7JfxCVUZFbHY9r5VymmfM1mQc182DIRG/A8sg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mTLDKIMtGyP0PvHrBSkiLBaZiNG/i99DC7J/IiuUMbv1Kfx5khSB9raWuJdthRacK fh/7OlGO5pgze9DJUaYlw/q7xr3Ru5ex/C/O++2Mq6xkNv7wezeoRLZYa9PkQuO1YF FJmzbImbDdbP73tN4hgXexQ8C7zOKsLdiPUU34fI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Luis Chamberlain , Russ Weight , "Rafael J. Wysocki" Subject: [PATCH 4/4] firmware_loader: fix up to_fw_sysfs() to preserve const Date: Thu, 1 Dec 2022 20:30:57 +0100 Message-Id: <20221201193057.1195255-4-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221201193057.1195255-1-gregkh@linuxfoundation.org> References: <20221201193057.1195255-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1426; i=gregkh@linuxfoundation.org; h=from:subject; bh=OMW+Gu7JfxCVUZFbHY9r5VymmfM1mQc182DIRG/A8sg=; b=owGbwMvMwCRo6H6F97bub03G02pJDMmdDB8X75fy8zMRiHB2km8SEOrWdVFb8lq+LElVc8FS8a5e R9GOWBYGQSYGWTFFli/beI7urzik6GVoexpmDisTyBAGLk4BmMgsQYYF83hnfi+sthJ2unrC6l/H3o 7pgcJaDAuOLXk/4+RXlT2Hjtt9WLuHdeO5ZGEHAA== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org to_fw_sysfs() was changed in commit 23680f0b7d7f ("driver core: make struct class.dev_uevent() take a const *") to pass in a const pointer but not pass it back out to handle some changes in the driver core. That isn't the best idea as it could cause problems if used incorrectly, so switch to use the container_of_const() macro instead which will preserve the const status of the pointer and enforce it by the compiler. Cc: Luis Chamberlain Cc: Russ Weight Cc: "Rafael J. Wysocki" Fixes: 23680f0b7d7f ("driver core: make struct class.dev_uevent() take a const *") Signed-off-by: Greg Kroah-Hartman --- drivers/base/firmware_loader/sysfs.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/base/firmware_loader/sysfs.h b/drivers/base/firmware_loader/sysfs.h index fd0b4ad9bdbb..0f0b1f7bf335 100644 --- a/drivers/base/firmware_loader/sysfs.h +++ b/drivers/base/firmware_loader/sysfs.h @@ -80,11 +80,8 @@ struct fw_sysfs { struct firmware *fw; void *fw_upload_priv; }; - -static inline struct fw_sysfs *to_fw_sysfs(const struct device *dev) -{ - return container_of(dev, struct fw_sysfs, dev); -} +#define to_fw_sysfs(__dev) \ + container_of_const(struct device, __dev, struct fw_sysfs, dev) void __fw_load_abort(struct fw_priv *fw_priv); -- 2.38.1