From patchwork Fri Mar 31 09:33:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 77697 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp440143vqo; Fri, 31 Mar 2023 02:50:54 -0700 (PDT) X-Google-Smtp-Source: AKy350ZLUQ86D3MDTOvXTiqkIiQHyK347dorkOzG7mWMgbXUy/RWUvzxYEbI3lq34/Fad6dkgiqi X-Received: by 2002:a17:906:2759:b0:931:ad32:79ed with SMTP id a25-20020a170906275900b00931ad3279edmr24081515ejd.12.1680256254346; Fri, 31 Mar 2023 02:50:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680256254; cv=none; d=google.com; s=arc-20160816; b=vFgIyewdo1QQB/63TQ8chNziY/Lpz6X3477TwryDDRWbTgc9QhArDc+T70F6TiJ2Ox H3qxQRWyLtbEuzhZS+SOxRQGdYtD43M6zB6JJx/tU8MnYhxBSyuZSxy1Ypididbvj5HU dtS7xaTSksUETK6iUKJgM+MXxEmArTj4nwMvhx5sQK09TXwP8wuZ6Uo9oZa1LPBkiCP6 qp05RmpTcK+gMllLKX34aiVOmpNrbsL1UZCIfhr5UtHgi798BOEOu7c1PBrq4G5hEuz9 XWqJWD1DNiYusMO0jMCyOoJsgvolWtiDbeJhv1pfb0U599KQg8a9m3Ah3oTjKKBkmHpi OBQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=MDbgFqfogM4PuegmuAx6ERQyJtdqe603A7ShodrOQ4U=; b=Uqe53lI1u6Hbdz5QQj+VDq4vVkyfQb2ofKh9jWIfUuN/cgozqv29ngfrYp5h9ac8Xa kpisKrMRshhWC5Us6kw9Hu4HK/uBc/MicMVQpO2Hxqc3hMHwbu5ld3qJPm3jhbXG5fn3 OjcWGTFV2BUR1TymPrIev/xyd2Jh/U+fwal2mChM/8fkvgZLIcW3RiHEuHA9q8+5Q8vi 1pDHRilEijAxO6DqAqRUT/EmQHOlkPL02Blk9iMLBXFUn2YGrK2mhcTm5L57ctb9RzHC 4KtOXWGHRpfgjqlSSbe8TiTkF/FnraVweTKN8rdhxN8WClZkzpxOJIiISkmr4Y21j72y jESA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=OCvvcjW8; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ul6-20020a170907ca8600b00947b7ce543fsi909467ejc.794.2023.03.31.02.50.30; Fri, 31 Mar 2023 02:50:54 -0700 (PDT) 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=pass header.i=@linuxfoundation.org header.s=korg header.b=OCvvcjW8; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232243AbjCaJeh (ORCPT + 99 others); Fri, 31 Mar 2023 05:34:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232216AbjCaJeK (ORCPT ); Fri, 31 Mar 2023 05:34:10 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B55F1EFE1 for ; Fri, 31 Mar 2023 02:33:39 -0700 (PDT) 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 CBCFC6264F for ; Fri, 31 Mar 2023 09:33:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE935C433EF; Fri, 31 Mar 2023 09:33:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1680255218; bh=wv/9juY+EqUubKOluUfFYi8Ig7tVyvAhOaUNWFGQD1c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OCvvcjW8xtKXhuAVeyIdBSC/oH1IIjwsHCZyMPSXcfgFg0F28z1BWM4jNyIfvaGsg 4VeHBn0l6er0sO3/9OlrF9gKgkG3h4pV3r+8H0/vvpXhDrxWR4v0zqvzv4Lo4LHmtp f/AvCSZwB6XDyUDqBuPoi0V5ikwKjJuoX5eNvKpw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , "Rafael J. Wysocki" Subject: [PATCH 5/7] driver core: class: remove dev_kobj from struct class Date: Fri, 31 Mar 2023 11:33:16 +0200 Message-Id: <20230331093318.82288-5-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230331093318.82288-1-gregkh@linuxfoundation.org> References: <20230331093318.82288-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2167; i=gregkh@linuxfoundation.org; h=from:subject; bh=wv/9juY+EqUubKOluUfFYi8Ig7tVyvAhOaUNWFGQD1c=; b=owGbwMvMwCRo6H6F97bub03G02pJDClqK+6K3rJhErvoJp35YF7pXk2pdWmLZ7l1cjDFOgXFc YedtTfuiGVhEGRikBVTZPmyjefo/opDil6Gtqdh5rAygQxh4OIUgIkUvWOYK3/68P0cxRkChkXl /6b99LCZPOOZFsM87UbBK2bTj9s5hzzo4np+zVCKyVwdAA== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=unavailable 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?1761876381766792751?= X-GMAIL-MSGID: =?utf-8?q?1761876381766792751?= The dev_kobj field in struct class is now only written to, but never read from, so it can be removed as it is useless. Cc: "Rafael J. Wysocki" Signed-off-by: Greg Kroah-Hartman Acked-by: Rafael J. Wysocki --- block/genhd.c | 1 - drivers/base/class.c | 4 ---- include/linux/device/class.h | 2 -- 3 files changed, 7 deletions(-) diff --git a/block/genhd.c b/block/genhd.c index e1e1230b1b9f..af7208a37c53 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -899,7 +899,6 @@ static int __init genhd_device_init(void) { int error; - block_class.dev_kobj = sysfs_dev_block_kobj; error = class_register(&block_class); if (unlikely(error)) return error; diff --git a/drivers/base/class.c b/drivers/base/class.c index fcfb295363cc..06b96d6faa19 100644 --- a/drivers/base/class.c +++ b/drivers/base/class.c @@ -197,10 +197,6 @@ int class_register(struct class *cls) return error; } - /* set the default /sys/dev directory for devices of this class */ - if (!cls->dev_kobj) - cls->dev_kobj = sysfs_dev_char_kobj; - cp->subsys.kobj.kset = class_kset; cp->subsys.kobj.ktype = &class_ktype; cp->class = cls; diff --git a/include/linux/device/class.h b/include/linux/device/class.h index f7aad64e256a..e946642c314e 100644 --- a/include/linux/device/class.h +++ b/include/linux/device/class.h @@ -27,7 +27,6 @@ struct fwnode_handle; * @name: Name of the class. * @class_groups: Default attributes of this class. * @dev_groups: Default attributes of the devices that belong to the class. - * @dev_kobj: The kobject that represents this class and links it into the hierarchy. * @dev_uevent: Called when a device is added, removed from this class, or a * few other things that generate uevents to add the environment * variables. @@ -55,7 +54,6 @@ struct class { const struct attribute_group **class_groups; const struct attribute_group **dev_groups; - struct kobject *dev_kobj; int (*dev_uevent)(const struct device *dev, struct kobj_uevent_env *env); char *(*devnode)(const struct device *dev, umode_t *mode);