From patchwork Thu Feb 16 01:07:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 57784 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp31720wrn; Wed, 15 Feb 2023 17:11:56 -0800 (PST) X-Google-Smtp-Source: AK7set+pR8GK5M5Da3GKfDxmcDghyg1dx7v1ur9LTYqvt9thS+LnqLgqpnzhJQVBR2dmWUI7/Zej X-Received: by 2002:a17:903:228d:b0:19a:93fa:2921 with SMTP id b13-20020a170903228d00b0019a93fa2921mr5226806plh.24.1676509916504; Wed, 15 Feb 2023 17:11:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676509916; cv=none; d=google.com; s=arc-20160816; b=bZj8t81+a6UUsll5rZTVHEApg3AN7xTbFYf2qcGVXh/AtzZcmrFhlRcgnefSiJdMmo CtH2bsehr9igTiRA0YVOrXD0cjcddbPBXVF23CXJpbKFeA5+JyMIXJt9FACG0RWDnWKj 1+tnEqGjfDESn6hA8Ad3n0HclbWRWlFYbMlp+UEfAouKQP1v2vapBn3rNu+ux78JtaBB ABHcbGGwiWYRPRAd4IWxZRy9Srt10w7M3G50qZAxmetCiOS3MtHVhXN7Yaum4o1oGnxv C9bieWEzvl6FKaqiVNL7/r8pap2ifsUshXIe9JTxuR8U23+UzsUkEUPnvNdXJLn87yQP 5eVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:message-id:content-transfer-encoding :mime-version:subject:date:dkim-signature:from; bh=ItomYs61DHkWHIq00wwL+r8/yJzvcsCtSdruexqYJkU=; b=PeYfMCu/0B59HJzw3UKp/yYiqzwsdM5rjv2N2Tet81EgMA+JCuWdgs5+GiJxYBh03Y g0Tcu1SrysThJKpIIbb/Wp9WzcF/Pud3KEmZ7X8hbYSv/e07KGamagubVYusA8vATyv1 ESZZNUt+YhVNtlRavhgld0norG3faCyDWUs2t0E8vbdHMGkDfDuiCmPJ1fDviMPDUAJD I72qLfPSmnyHzaDnTl2JOTbr5gVIs1eslxsss6pdZekkXJrhwjBPhFjxjp2VjVp4pWAE f8bwMDFsi1Ko9ijJ1G/msjO9fY31pD+v1EC8bN6gpbsUafMDZFdCQDhsXjm/0/evqKqE KVzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@weissschuh.net header.s=mail header.b=uV3znYgr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q18-20020a170902dad200b0019aa822f680si10058523plx.292.2023.02.15.17.11.43; Wed, 15 Feb 2023 17:11:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@weissschuh.net header.s=mail header.b=uV3znYgr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229523AbjBPBHd (ORCPT + 99 others); Wed, 15 Feb 2023 20:07:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229477AbjBPBHb (ORCPT ); Wed, 15 Feb 2023 20:07:31 -0500 Received: from todd.t-8ch.de (todd.t-8ch.de [IPv6:2a01:4f8:c010:41de::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C3372CFCE for ; Wed, 15 Feb 2023 17:07:31 -0800 (PST) From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=weissschuh.net; s=mail; t=1676509649; bh=P/SbOyMzlTQLiogl1RKS9/I1ffYT18SGT5g5cIfqd2Y=; h=From:Date:Subject:To:Cc:From; b=uV3znYgrIZwShkNVfjQcRp+ytl9nR0n3bv27zV1ugjoYs6YCkIb/xInp77iNDsPy4 tz6wrkyMM50lXAPYFc1yEB4Y2UC9IJBELA4EHT1OehaOeZJQgn2acH281RiIFto1Xj KwUmAEa+e7Jus3axPfKbRAmVEj7oPhz+2YdjJmAo= Date: Thu, 16 Feb 2023 01:07:27 +0000 Subject: [PATCH] drm/amdgpu: make kobj_type structures constant MIME-Version: 1.0 Message-Id: <20230216-kobj_type-amdgpu-v1-1-b382ab606dc7@weissschuh.net> X-B4-Tracking: v=1; b=H4sIAM6B7WMC/x2NwQrCMBAFf6Xs2YUkrR78FRFJmtd2taYhsaKU/ ruLxxkYZqOKIqh0bjYqeEuVJSnYQ0P95NMIlqhMzrjWOHvixxLut9c3g/0zjnnlLraDgYU5xo4 0C76CQ/GpnzRM6zyrzAWDfP6fy3Xff0Q1jYl3AAAA To: Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1676509646; l=2787; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=P/SbOyMzlTQLiogl1RKS9/I1ffYT18SGT5g5cIfqd2Y=; b=NjH37FHMLFd1p1EMnA7Qx7v7EotJR3ho6RIcFLYC+ycLiNGbUWb8S/f01QeZrTlDNaN6tjGbb wjaDdczIgnxD1m0GhAmynkfczaMBlOwEHYwPdJW5DQU/y0ZY7RRr6Cd X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757948062078470742?= X-GMAIL-MSGID: =?utf-8?q?1757948062078470742?= Since commit ee6d3dd4ed48 ("driver core: make kobj_type constant.") the driver core allows the usage of const struct kobj_type. Take advantage of this to constify the structure definitions to prevent modification at runtime. Signed-off-by: Thomas Weißschuh Reviewed-by: Christian König --- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 10 +++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) --- base-commit: 033c40a89f55525139fd5b6342281b09b97d05bf change-id: 20230216-kobj_type-amdgpu-4d3f0e1e05d4 Best regards, diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c index 1bbd56029a4f..8e04952e5144 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c @@ -704,7 +704,7 @@ static void ip_hw_instance_release(struct kobject *kobj) kfree(ip_hw_instance); } -static struct kobj_type ip_hw_instance_ktype = { +static const struct kobj_type ip_hw_instance_ktype = { .release = ip_hw_instance_release, .sysfs_ops = &ip_hw_instance_sysfs_ops, .default_groups = ip_hw_instance_groups, @@ -723,7 +723,7 @@ static void ip_hw_id_release(struct kobject *kobj) kfree(ip_hw_id); } -static struct kobj_type ip_hw_id_ktype = { +static const struct kobj_type ip_hw_id_ktype = { .release = ip_hw_id_release, .sysfs_ops = &kobj_sysfs_ops, }; @@ -786,18 +786,18 @@ static const struct sysfs_ops ip_die_entry_sysfs_ops = { .show = ip_die_entry_attr_show, }; -static struct kobj_type ip_die_entry_ktype = { +static const struct kobj_type ip_die_entry_ktype = { .release = ip_die_entry_release, .sysfs_ops = &ip_die_entry_sysfs_ops, .default_groups = ip_die_entry_groups, }; -static struct kobj_type die_kobj_ktype = { +static const struct kobj_type die_kobj_ktype = { .release = die_kobj_release, .sysfs_ops = &kobj_sysfs_ops, }; -static struct kobj_type ip_discovery_ktype = { +static const struct kobj_type ip_discovery_ktype = { .release = ip_disc_release, .sysfs_ops = &kobj_sysfs_ops, }; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c index 4b9e7b050ccd..6d13ce6ec9cc 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c @@ -228,7 +228,7 @@ static const struct sysfs_ops amdgpu_xgmi_hive_ops = { .show = amdgpu_xgmi_show_attrs, }; -struct kobj_type amdgpu_xgmi_hive_type = { +static const struct kobj_type amdgpu_xgmi_hive_type = { .release = amdgpu_xgmi_hive_release, .sysfs_ops = &amdgpu_xgmi_hive_ops, .default_groups = amdgpu_xgmi_hive_groups,