From nobody Sat Feb 7 23:43:42 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 761F3E9271A for ; Thu, 5 Oct 2023 15:57:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237258AbjJEP5g (ORCPT ); Thu, 5 Oct 2023 11:57:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231635AbjJEP4i (ORCPT ); Thu, 5 Oct 2023 11:56:38 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2113A524E for ; Thu, 5 Oct 2023 06:52:33 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0C289C4AF78; Thu, 5 Oct 2023 13:45:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1696513527; bh=z9yHryktLQ/UzFBVnJXiqgioqdxuqKYjFXcrXINCIc0=; h=From:To:Cc:Subject:Date:From; b=Qy3fzBkM3iPcYh+chVdNofwLuWiK3zJ1B4VFbuuvUkSC5goS7nPviXVLFiNwOJp9o 603SufiCXZSyK8Gep4Z/ehXRwdTufgfDvAi0NGxA6eP54s2k9tBxPQOPBtUL1naNyb hVuiSvqGV/XX1lyWZ9NUNjKV+q+jxccsWQKJRhBM= From: Greg Kroah-Hartman To: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman Subject: [PATCH] staging: vme_user: make vme_user_sysfs_class constant Date: Thu, 5 Oct 2023 15:45:24 +0200 Message-ID: <2023100523-throwback-oak-a164@gregkh> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3731; i=gregkh@linuxfoundation.org; h=from:subject:message-id; bh=z9yHryktLQ/UzFBVnJXiqgioqdxuqKYjFXcrXINCIc0=; b=owGbwMvMwCRo6H6F97bub03G02pJDKlyez8Xr5j8uu3XDL4+4cV+x0v7eqRdhaeX9tRL1ehES gQLHJbqiGVhEGRikBVTZPmyjefo/opDil6Gtqdh5rAygQxh4OIUgImkJzEsmLRkwfmKjrfX2JJC bX6fjq0+IL6MmWGe5bd5X37O0BEwvbbp7C378qUnknjOAgA= 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, making all 'class' structures to be declared at build time placing them into read-only memory, instead of having to be dynamically allocated at load time. Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vme_user/vme_user.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/staging/vme_user/vme_user.c b/drivers/staging/vme_user= /vme_user.c index b9367b575d00..36183f923768 100644 --- a/drivers/staging/vme_user/vme_user.c +++ b/drivers/staging/vme_user/vme_user.c @@ -37,7 +37,7 @@ #include "vme.h" #include "vme_user.h" =20 -static const char driver_name[] =3D "vme_user"; +#define DRIVER_NAME "vme_user" =20 static int bus[VME_USER_BUS_MAX]; static unsigned int bus_num; @@ -101,9 +101,11 @@ struct image_desc { static struct image_desc image[VME_DEVS]; =20 static struct cdev *vme_user_cdev; /* Character device */ -static struct class *vme_user_sysfs_class; /* Sysfs class */ static struct vme_dev *vme_user_bridge; /* Pointer to user device */ =20 +static const struct class vme_user_sysfs_class =3D { + .name =3D DRIVER_NAME, +}; static const int type[VME_DEVS] =3D { MASTER_MINOR, MASTER_MINOR, MASTER_MINOR, MASTER_MINOR, SLAVE_MINOR, SLAVE_MINOR, @@ -540,8 +542,7 @@ static int vme_user_probe(struct vme_dev *vdev) } =20 /* Assign major and minor numbers for the driver */ - err =3D register_chrdev_region(MKDEV(VME_MAJOR, 0), VME_DEVS, - driver_name); + err =3D register_chrdev_region(MKDEV(VME_MAJOR, 0), VME_DEVS, DRIVER_NAME= ); if (err) { dev_warn(&vdev->dev, "Error getting Major Number %d for driver.\n", VME_MAJOR); @@ -614,10 +615,9 @@ static int vme_user_probe(struct vme_dev *vdev) } =20 /* Create sysfs entries - on udev systems this creates the dev files */ - vme_user_sysfs_class =3D class_create(driver_name); - if (IS_ERR(vme_user_sysfs_class)) { + err =3D class_register(&vme_user_sysfs_class); + if (err) { dev_err(&vdev->dev, "Error creating vme_user class.\n"); - err =3D PTR_ERR(vme_user_sysfs_class); goto err_master; } =20 @@ -641,7 +641,7 @@ static int vme_user_probe(struct vme_dev *vdev) } =20 num =3D (type[i] =3D=3D SLAVE_MINOR) ? i - (MASTER_MAX + 1) : i; - image[i].device =3D device_create(vme_user_sysfs_class, NULL, + image[i].device =3D device_create(&vme_user_sysfs_class, NULL, MKDEV(VME_MAJOR, i), NULL, name, num); if (IS_ERR(image[i].device)) { @@ -656,9 +656,9 @@ static int vme_user_probe(struct vme_dev *vdev) err_sysfs: while (i > 0) { i--; - device_destroy(vme_user_sysfs_class, MKDEV(VME_MAJOR, i)); + device_destroy(&vme_user_sysfs_class, MKDEV(VME_MAJOR, i)); } - class_destroy(vme_user_sysfs_class); + class_unregister(&vme_user_sysfs_class); =20 /* Ensure counter set correctly to unalloc all master windows */ i =3D MASTER_MAX + 1; @@ -696,9 +696,9 @@ static void vme_user_remove(struct vme_dev *dev) /* Remove sysfs Entries */ for (i =3D 0; i < VME_DEVS; i++) { mutex_destroy(&image[i].mutex); - device_destroy(vme_user_sysfs_class, MKDEV(VME_MAJOR, i)); + device_destroy(&vme_user_sysfs_class, MKDEV(VME_MAJOR, i)); } - class_destroy(vme_user_sysfs_class); + class_unregister(&vme_user_sysfs_class); =20 for (i =3D MASTER_MINOR; i < (MASTER_MAX + 1); i++) { kfree(image[i].kern_buf); @@ -720,7 +720,7 @@ static void vme_user_remove(struct vme_dev *dev) } =20 static struct vme_driver vme_user_driver =3D { - .name =3D driver_name, + .name =3D DRIVER_NAME, .match =3D vme_user_match, .probe =3D vme_user_probe, .remove =3D vme_user_remove, --=20 2.42.0