From nobody Thu Jan 1 08:57:38 2026 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 DF46BC00A8F for ; Tue, 24 Oct 2023 11:48:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231206AbjJXLsq (ORCPT ); Tue, 24 Oct 2023 07:48:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229829AbjJXLsp (ORCPT ); Tue, 24 Oct 2023 07:48:45 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2779FF9 for ; Tue, 24 Oct 2023 04:48:43 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B690C433C7; Tue, 24 Oct 2023 11:48:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1698148122; bh=K1yZ5Y/kn6qVIOzgf5AlQf61xblYYAfEXDw52gcn18A=; h=From:To:Cc:Subject:Date:From; b=kNIK7y8E7xV3EQUU5BYjE4pLRg7t2qHcryORasDbY+/J4USpmA0+Qtu26NHDUeBQK pYpcA8T3dGw8x1oPwKZXpC44+4LLCYa/CaXnH+CyE9AzKGtoGAdmDWBd5PdfLMMlgc DaoXLoZyg+MfFy79mSUu8luULRPVqikoBSNPFAQ4= From: Greg Kroah-Hartman To: linuxppc-dev@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Frederic Barrat , Andrew Donnellan , Arnd Bergmann Subject: [PATCH] cxl: make cxl_class constant Date: Tue, 24 Oct 2023 13:48:35 +0200 Message-ID: <2023102434-haiku-uphill-0c11@gregkh> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2742; i=gregkh@linuxfoundation.org; h=from:subject:message-id; bh=K1yZ5Y/kn6qVIOzgf5AlQf61xblYYAfEXDw52gcn18A=; b=owGbwMvMwCRo6H6F97bub03G02pJDKnm64Ve7Dm24tiyzxcOBJ/TqGwN8U1eI8Z0OFQzcu3tP 6nzYr2WdMSyMAgyMciKKbJ82cZzdH/FIUUvQ9vTMHNYmUCGMHBxCsBEfnAzzPfewsi8+0CScuy2 RQuPP/mwqf7M3YcM86uE+UICTJo+yHk+m/bOg/NWTp7qQQA= X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Now that the driver core allows for struct class to be in read-only memory, we should make all 'class' structures declared at build time placing them into read-only memory, instead of having to be dynamically allocated at runtime. Cc: Frederic Barrat Cc: Andrew Donnellan Cc: Arnd Bergmann Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Greg Kroah-Hartman Acked-by: Frederic Barrat --- drivers/misc/cxl/file.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/misc/cxl/file.c b/drivers/misc/cxl/file.c index 144d1f2d78ce..012e11b959bc 100644 --- a/drivers/misc/cxl/file.c +++ b/drivers/misc/cxl/file.c @@ -38,8 +38,6 @@ =20 static dev_t cxl_dev; =20 -static struct class *cxl_class; - static int __afu_open(struct inode *inode, struct file *file, bool master) { struct cxl *adapter; @@ -559,7 +557,10 @@ static char *cxl_devnode(const struct device *dev, umo= de_t *mode) return kasprintf(GFP_KERNEL, "cxl/%s", dev_name(dev)); } =20 -extern struct class *cxl_class; +static const struct class cxl_class =3D { + .name =3D "cxl", + .devnode =3D cxl_devnode, +}; =20 static int cxl_add_chardev(struct cxl_afu *afu, dev_t devt, struct cdev *c= dev, struct device **chardev, char *postfix, char *desc, @@ -575,7 +576,7 @@ static int cxl_add_chardev(struct cxl_afu *afu, dev_t d= evt, struct cdev *cdev, return rc; } =20 - dev =3D device_create(cxl_class, &afu->dev, devt, afu, + dev =3D device_create(&cxl_class, &afu->dev, devt, afu, "afu%i.%i%s", afu->adapter->adapter_num, afu->slice, postfix); if (IS_ERR(dev)) { rc =3D PTR_ERR(dev); @@ -633,14 +634,14 @@ void cxl_chardev_afu_remove(struct cxl_afu *afu) =20 int cxl_register_afu(struct cxl_afu *afu) { - afu->dev.class =3D cxl_class; + afu->dev.class =3D &cxl_class; =20 return device_register(&afu->dev); } =20 int cxl_register_adapter(struct cxl *adapter) { - adapter->dev.class =3D cxl_class; + adapter->dev.class =3D &cxl_class; =20 /* * Future: When we support dynamically reprogramming the PSL & AFU we @@ -678,13 +679,11 @@ int __init cxl_file_init(void) =20 pr_devel("CXL device allocated, MAJOR %i\n", MAJOR(cxl_dev)); =20 - cxl_class =3D class_create("cxl"); - if (IS_ERR(cxl_class)) { + rc =3D class_register(&cxl_class); + if (rc) { pr_err("Unable to create CXL class\n"); - rc =3D PTR_ERR(cxl_class); goto err; } - cxl_class->devnode =3D cxl_devnode; =20 return 0; =20 @@ -696,5 +695,5 @@ int __init cxl_file_init(void) void cxl_file_exit(void) { unregister_chrdev_region(cxl_dev, CXL_NUM_MINORS); - class_destroy(cxl_class); + class_unregister(&cxl_class); } --=20 2.42.0