From patchwork Thu Oct 5 13:45:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 148840 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2016:b0:403:3b70:6f57 with SMTP id fe22csp398307vqb; Thu, 5 Oct 2023 09:01:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF2GllO9M189Zpt4UkDpOX7rPs3ArXDMBkg6KttLYgouIIKxSsHDOUrQQRkfJfQVIGxeSGa X-Received: by 2002:a05:6358:720c:b0:134:cd32:3565 with SMTP id h12-20020a056358720c00b00134cd323565mr5433288rwa.31.1696521683734; Thu, 05 Oct 2023 09:01:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696521683; cv=none; d=google.com; s=arc-20160816; b=BFFo4FAokS8gwb1fO6wLr2Uc1Sk5Ltk900b1jiIe0QJ2BUJ/LOioZ/lbE9z3gGF2Mi apf4KDPMiFveMKmWjYB/mwsP/xXyF/Hcdy+vNZ2RN2tqihjsnWdSjTy8AKLifDACFuKF 3nJsooFiz8cnHNnSi13LCpjoKLjY4yhsukkMpaFsQ8WNn4sswCusUmU9XI1c6LSDqovB 8SaDczy1Xug2VCZkNqU3/hmwKmsCAahA6f3xXcuxDdxrks9xxt6cRuiskET1R3i0R4xo Z7+txBhqr+FbFfk9IKhT9TuB6ssEPu4caWWJs/03i9DowV5mrZzoz9iCsEYi1RouZSzF ZiJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:lines:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=2MsI2x7PCwSlX3LRNUHSDD5IOBpRnAs49RtPkqhKXf0=; fh=QUHXZmb6Jp0OmFlHz0ejxu3TcFROAX6yUVJCHHll3NI=; b=B2aKK+O5qLYwHtTHlgAGZNjvnj8n5IVQ5dHj17oK7VEzPXVyyBnkY8GoZO7Kih58hE bLMeK6SVmWK6pHbNULkHIbYIQN+jB5zExmYw3AaQ635V9Q8saTICiS8TDrpEs8Vhll+3 K+0XzRyNdS4u60DLdFYuLePAVb7ZVd+BG5lrkokYyt6S1oNieKDXw+noLin4OiK26ZFF Iw36iZHAz1XIz7J9MD2ZjxoqxBMSjVQGZZtyMz1/Yx66+02oDMiRFl9ZGrpk09d37jq4 T3zfCNBBcQ7LfKb+KlK1D1uRTtQbNUFM8n2dR5mE3ImY5m9fKXRbdVMC0nVym/wEFhoE M1AA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Qy3fzBkM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id v135-20020a63618d000000b00585999a38a6si1656817pgb.793.2023.10.05.09.01.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 09:01:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Qy3fzBkM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 5D739826FAB6; Thu, 5 Oct 2023 08:59:48 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237179AbjJEP5g (ORCPT + 19 others); 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 Lines: 103 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 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Thu, 05 Oct 2023 08:59:48 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778931921154524291 X-GMAIL-MSGID: 1778931921154524291 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" -static const char driver_name[] = "vme_user"; +#define DRIVER_NAME "vme_user" 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]; 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 */ +static const struct class vme_user_sysfs_class = { + .name = DRIVER_NAME, +}; static const int type[VME_DEVS] = { 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) } /* Assign major and minor numbers for the driver */ - err = register_chrdev_region(MKDEV(VME_MAJOR, 0), VME_DEVS, - driver_name); + err = 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) } /* Create sysfs entries - on udev systems this creates the dev files */ - vme_user_sysfs_class = class_create(driver_name); - if (IS_ERR(vme_user_sysfs_class)) { + err = class_register(&vme_user_sysfs_class); + if (err) { dev_err(&vdev->dev, "Error creating vme_user class.\n"); - err = PTR_ERR(vme_user_sysfs_class); goto err_master; } @@ -641,7 +641,7 @@ static int vme_user_probe(struct vme_dev *vdev) } num = (type[i] == SLAVE_MINOR) ? i - (MASTER_MAX + 1) : i; - image[i].device = device_create(vme_user_sysfs_class, NULL, + image[i].device = 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); /* Ensure counter set correctly to unalloc all master windows */ i = MASTER_MAX + 1; @@ -696,9 +696,9 @@ static void vme_user_remove(struct vme_dev *dev) /* Remove sysfs Entries */ for (i = 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); for (i = 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) } static struct vme_driver vme_user_driver = { - .name = driver_name, + .name = DRIVER_NAME, .match = vme_user_match, .probe = vme_user_probe, .remove = vme_user_remove,