From patchwork Fri Mar 24 09:08:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 74446 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp486663vqo; Fri, 24 Mar 2023 02:25:41 -0700 (PDT) X-Google-Smtp-Source: AKy350ba6DzxtRF7pyTkT6EprzN5xhHXZCDZ5bG2NzBHOdLBadQDwJ9UEyY9lQEIPXYuCJQ2LY2T X-Received: by 2002:a17:902:c405:b0:199:2a89:f912 with SMTP id k5-20020a170902c40500b001992a89f912mr2695096plk.20.1679649941625; Fri, 24 Mar 2023 02:25:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679649941; cv=none; d=google.com; s=arc-20160816; b=nw9etNKwRVf/Sdzm7sYyn0YHqCzUhqHC04reIFpYwRMXOyWPMfyso9T3dPnrLxitSX MKNATd6Ii7cWuFo9RzSKu8Z6+Cfh/rBt5Sw6arSeutWwWwAuC4hHJmflSUVnGzNz5wqX mLgkGbZycsAv6DP+Xnfunc34tG1RIvWcpH8Ws5MqRCbPId/dp0sovAisE4UDl4hWvfCr 05oPmZ6U9FK1pVLZ5abM76FidftJ7rIJJQzj7+82nXi/SA4utiHbbZLMcaS0TLE3zGIS ZoW+qXUyDX266GKmtM2wfZ/YJfeF/+GSOGVx41on7fdC/h0nHT54HA5NR5wjRdikadnT d2Xg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=2a84NqsiH6C306ZBGrJ7PNSYHVQ5+UZRvO3wE0IQ5IU=; b=wk4BNxkK4Tlt65CtBTEj4MHFkSsFokAi5KIw+e5RKiwR1yac8C5soGYW1vY/K4b8bZ parcIuH2JlbS24iXiKEXg/fd7vmarIm3RNQhRntbZJAgdMWRsHFzw68p8xsih2jd2oP7 /nExmvHMIdzFZw3xyT041PXxdrzftPm3lAMinVMEeR08V32Ml4QORQLBH3FQNLRrMdvD l/1sYKtIcXrLX9RnpL0A4q1cyeKwoTiJH5VLGLyC/zXbcjROPcGAbGaeMneSE0NOmQsL 8/e8BBLfEBrmWTa3ZbxHvXoW8U2beWrqqFOs1BK8FmuINza0ocMJM9KJLuGMDjaZph18 pabg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Je/O+s9a"; 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 y13-20020a17090322cd00b0019f2e2b3576si22254900plg.144.2023.03.24.02.25.28; Fri, 24 Mar 2023 02:25:41 -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="Je/O+s9a"; 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 S231872AbjCXJI0 (ORCPT + 99 others); Fri, 24 Mar 2023 05:08:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231765AbjCXJIW (ORCPT ); Fri, 24 Mar 2023 05:08:22 -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 42ECB59C9 for ; Fri, 24 Mar 2023 02:08:20 -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 CCA84629C9 for ; Fri, 24 Mar 2023 09:08:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6269C4339B; Fri, 24 Mar 2023 09:08:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1679648899; bh=75VgEUusjpyyPrc25gEBtohFIWCJvQPmRGpXQUpk4N8=; h=From:To:Cc:Subject:Date:From; b=Je/O+s9aWE0fr4le82h+MNhr1Jj1pJ6pH/oBJ7O76nAjmHndSK3ipXmlI8E6ZXNW2 +q2syWNq0r+udmI3HJGGBKpW8UGAhrA1sjGjKkD5W/w+L7CZ91XENGpB2fl2cDevCa tK2c7WOyQhmC0upm+K0nNNGOlODm28DPdKNgV8AY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , "Rafael J. Wysocki" Subject: [PATCH] driver core: bus: move documentation for lock_key to proper location. Date: Fri, 24 Mar 2023 10:08:14 +0100 Message-Id: <20230324090814.386654-1-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1770; i=gregkh@linuxfoundation.org; h=from:subject; bh=75VgEUusjpyyPrc25gEBtohFIWCJvQPmRGpXQUpk4N8=; b=owGbwMvMwCRo6H6F97bub03G02pJDCmyGbUnIrMXPyk/cLfmtdsB5nUCrCdq1m26/Yk3ffrRc v0jS0yDOmJZGASZGGTFFFm+bOM5ur/ikKKXoe1pmDmsTCBDGLg4BWAifhsZ5tlsk0n8OW/B7JOn 9RauWm/EybzC4ATD/LqJlyerKHCkzos+znt/ZkOayIkJ8wE= 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?1761240617279243228?= X-GMAIL-MSGID: =?utf-8?q?1761240617279243228?= In commit 37e98d9bedb5 ("driver core: bus: move lock_class_key into dynamic structure"), the lock_key variable moved out of struct bus_type and into struct subsys_private, yet the documentation for it did not move. Fix that up and place the documentation comment in the correct location. Cc: "Rafael J. Wysocki" Fixes: 37e98d9bedb5 ("driver core: bus: move lock_class_key into dynamic structure") Signed-off-by: Greg Kroah-Hartman --- drivers/base/base.h | 1 + include/linux/device/bus.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/base.h b/drivers/base/base.h index 09c6682d16b5..5cca43a124ba 100644 --- a/drivers/base/base.h +++ b/drivers/base/base.h @@ -33,6 +33,7 @@ * avoid namespace conflicts * @class - pointer back to the struct class that this structure is associated * with. + * @lock_key: Lock class key for use by the lock validator * * This structure is the one that is the actual kobject allowing struct * bus_type/class to be statically allocated safely. Nothing outside of the diff --git a/include/linux/device/bus.h b/include/linux/device/bus.h index b517b82d4723..05a0c4992a49 100644 --- a/include/linux/device/bus.h +++ b/include/linux/device/bus.h @@ -65,7 +65,6 @@ struct fwnode_handle; * @iommu_ops: IOMMU specific operations for this bus, used to attach IOMMU * driver implementations to a bus and allow the driver to do * bus-specific setup - * @lock_key: Lock class key for use by the lock validator * @need_parent_lock: When probing or removing a device on this bus, the * device core should lock the device's parent. *