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 0BDC7C4321E for ; Mon, 5 Dec 2022 12:12:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231758AbiLEMMi (ORCPT ); Mon, 5 Dec 2022 07:12:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231688AbiLEMM1 (ORCPT ); Mon, 5 Dec 2022 07:12:27 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B8611A227 for ; Mon, 5 Dec 2022 04:12:26 -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 A36EA61033 for ; Mon, 5 Dec 2022 12:12:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AB129C433C1; Mon, 5 Dec 2022 12:12:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1670242345; bh=43jvevdKv4umtU+wp4x+NPKgDNGKY9Kf0Q7wT6D1kl0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hi0hvPgkNF6kJ4476VQzRzmX/STtGvBy6KyQLv86O7AnTaVcY75yee4wCp/8qgpW8 QjyB3zO1tpv8cn67xh7SQDv8lowHdNjzjZBGdXszg8Ca/dZFeZewSx8955IlnTxWeG 6RYnmxX2aH8AVpAxa1m41h8vsNmkEdFJvqR4nWZE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Luis Chamberlain , "Rafael J. Wysocki" , Jason Gunthorpe , Russ Weight Subject: [PATCH v2 4/4] firmware_loader: fix up to_fw_sysfs() to preserve const Date: Mon, 5 Dec 2022 13:12:06 +0100 Message-Id: <20221205121206.166576-4-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221205121206.166576-1-gregkh@linuxfoundation.org> References: <20221205121206.166576-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1518; i=gregkh@linuxfoundation.org; h=from:subject; bh=43jvevdKv4umtU+wp4x+NPKgDNGKY9Kf0Q7wT6D1kl0=; b=owGbwMvMwCRo6H6F97bub03G02pJDMm9D0TtFm79+chBzTymYqGa44T6QxdDmJ5xzdMvnVPjZvRs qpNRRywLgyATg6yYIsuXbTxH91ccUvQytD0NM4eVCWQIAxenAEzEYyXDXNHSuy7qtxw5X100Ld36tj p514R2ZYb5fn8lvNx80v6+yktbduBxjO7XrorLAA== 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: "Rafael J. Wysocki" Reviewed-by: Jason Gunthorpe Acked-by: Russ Weight Fixes: 23680f0b7d7f ("driver core: make struct class.dev_uevent() take a const *") Signed-off-by: Greg Kroah-Hartman --- v2: - respin with changed container_of_const() parameters drivers/base/firmware_loader/sysfs.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/base/firmware_loader/sysfs.h b/drivers/base/firmware_loader/sysfs.h index fd0b4ad9bdbb..2060add8ef81 100644 --- a/drivers/base/firmware_loader/sysfs.h +++ b/drivers/base/firmware_loader/sysfs.h @@ -80,11 +80,7 @@ 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(__dev, struct fw_sysfs, dev) void __fw_load_abort(struct fw_priv *fw_priv); -- 2.38.1