From patchwork Fri Feb 10 10:24:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 55375 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp874167wrn; Fri, 10 Feb 2023 02:31:32 -0800 (PST) X-Google-Smtp-Source: AK7set/lK7Q7378kdTrsNRerl1d631SPEjidtDLMOWz15qlnx3ZKEqihKYsemDuvcHrWojgeDi94 X-Received: by 2002:a17:906:2da9:b0:878:5bce:291a with SMTP id g9-20020a1709062da900b008785bce291amr15470557eji.36.1676025092402; Fri, 10 Feb 2023 02:31:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676025092; cv=none; d=google.com; s=arc-20160816; b=hY0e+qTCjBJxN2FnW0E7JuJvOSx5dpkteL3R6MOXrYR5p8as/05pC5FFgr77bWHmdJ eoMOPvVG5ZbCgJQdy5UXSNTomFOIY+W2XHY+d2LBw031kblgJ3pGt5SsYQUmHfJma9ur K6uyMlMoRHD1e4H9i5mXjVIMMRELjVdNyPFs5Buxc5vbJPaGUdEIpZvXepykzYwdn2HX +scMt1oLy88i52CF2PSkPH2OJXfS1eHkVCMCj65smrii9YCcoyL5UoRr9AwnyrD/HvTU oP04TjP5abFcyaqB0UnGGzMxc0ohJwrtyMNIKNDB83jCKJhXQsQtV5BI5NclfHtjZglh 3I6Q== 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=iC4PiLCM3uGvAaiPBQo0XZVnNy8VClZHISucipZtQ8g=; b=G+Acr/42hlYNDmv5jEHG17i8yuU9kKy87CFKnXQH8evIXP2kVvmJgbkEmIRfGCrTjw 5d0Sd9hwdJdnbIO4ohFEtf5LUfEcufTuoDxPmpTnTimnushXMgO7DSN1xpwxQUptgvoi iVXMnpQjLodO6Ce/2fsVRlk14TRa+Wrk+Xzi6s1ElNMiIzYblJQ8tiINC5zYqlO+H/uP J/CnyLLnQLVre+Chk30mz0b/1ojtbclvM9Uut0XAKjH3sVIPYY91B7TArEfIgXNlYMwy Aj6LQMU/2tHe7ot90GuEDWPCPVw6G3h2QmMomZZCAA6V4hLpWcAR1/CX5ApQNued4G00 2REw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=wchrfjvK; 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 f4-20020a1709063f4400b00890ac8da46asi5299152ejj.832.2023.02.10.02.31.09; Fri, 10 Feb 2023 02:31:32 -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=pass header.i=@linuxfoundation.org header.s=korg header.b=wchrfjvK; 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 S231645AbjBJKYW (ORCPT + 99 others); Fri, 10 Feb 2023 05:24:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231376AbjBJKYV (ORCPT ); Fri, 10 Feb 2023 05:24:21 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3CC3B6C7FC for ; Fri, 10 Feb 2023 02:24:19 -0800 (PST) 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 sin.source.kernel.org (Postfix) with ESMTPS id 74577CE272C for ; Fri, 10 Feb 2023 10:24:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5E858C433A4; Fri, 10 Feb 2023 10:24:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1676024651; bh=0hdsET54CaVYW45VsXim3ULKaluWSvH8kT2ZvUX73XY=; h=From:To:Cc:Subject:Date:From; b=wchrfjvK/7aEo4sSshodTstbHwdO4zb/DKjL6eI9IV9ro3L6w7kgqvrPC/2prG97Q PKM3Y3C4FDe5ood0nOxSEOXqQPWo84QUe84ekr0lbqGV1cyRimYfANpWi98R+EQngT ySWX0o4wrDIo6n3L+LsWj0zfsT/fqMV92WjCgsPo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , "Rafael J. Wysocki" Subject: [PATCH] driver core: cpu: don't hand-override the uevent bus_type callback. Date: Fri, 10 Feb 2023 11:24:08 +0100 Message-Id: <20230210102408.1083177-1-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2071; i=gregkh@linuxfoundation.org; h=from:subject; bh=0hdsET54CaVYW45VsXim3ULKaluWSvH8kT2ZvUX73XY=; b=owGbwMvMwCRo6H6F97bub03G02pJDMnPpF3vOt7+bhx2ylFzgniect6rn1v3Xfz7Ot1/5WvJU7Nc fLqMOmJYGASZGGTFFFm+bOM5ur/ikKKXoe1pmDmsTCBDGLg4BWAiU3YzLLikFf5l2Wy2Sbrs/nbyDh csJb//NmCYsf7YglV8y5YJrZGflxndpLiPU+MNAA== X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1757439687163385978?= X-GMAIL-MSGID: =?utf-8?q?1757439687163385978?= Instead of having to change the uevent bus_type callback by hand at runtime, set it at build time based on the build configuration options, making this much simpler to maintain and understand (and allow to make the structure constant.) Cc: "Rafael J. Wysocki" Signed-off-by: Greg Kroah-Hartman Acked-by: Rafael J. Wysocki --- drivers/base/cpu.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c index 8bb623039bb2..182c6122f815 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c @@ -125,17 +125,6 @@ static DEVICE_ATTR(release, S_IWUSR, NULL, cpu_release_store); #endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */ #endif /* CONFIG_HOTPLUG_CPU */ -struct bus_type cpu_subsys = { - .name = "cpu", - .dev_name = "cpu", - .match = cpu_subsys_match, -#ifdef CONFIG_HOTPLUG_CPU - .online = cpu_subsys_online, - .offline = cpu_subsys_offline, -#endif -}; -EXPORT_SYMBOL_GPL(cpu_subsys); - #ifdef CONFIG_KEXEC #include @@ -348,6 +337,20 @@ static int cpu_uevent(const struct device *dev, struct kobj_uevent_env *env) } #endif +struct bus_type cpu_subsys = { + .name = "cpu", + .dev_name = "cpu", + .match = cpu_subsys_match, +#ifdef CONFIG_HOTPLUG_CPU + .online = cpu_subsys_online, + .offline = cpu_subsys_offline, +#endif +#ifdef CONFIG_GENERIC_CPU_AUTOPROBE + .uevent = cpu_uevent, +#endif +}; +EXPORT_SYMBOL_GPL(cpu_subsys); + /* * register_cpu - Setup a sysfs device for a CPU. * @cpu - cpu->hotpluggable field set to 1 will generate a control file in @@ -368,9 +371,6 @@ int register_cpu(struct cpu *cpu, int num) cpu->dev.offline_disabled = !cpu->hotpluggable; cpu->dev.offline = !cpu_online(num); cpu->dev.of_node = of_get_cpu_node(num, NULL); -#ifdef CONFIG_GENERIC_CPU_AUTOPROBE - cpu->dev.bus->uevent = cpu_uevent; -#endif cpu->dev.groups = common_cpu_attr_groups; if (cpu->hotpluggable) cpu->dev.groups = hotplugable_cpu_attr_groups;