From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Michael Ellerman <mpe@ellerman.id.au>, Nicholas Piggin <npiggin@gmail.com>, Christophe Leroy <christophe.leroy@csgroup.eu>, linuxppc-dev@lists.ozlabs.org Subject: [PATCH 14/36] powerpc/pseries: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:56 +0100 [thread overview] Message-ID: <20230313182918.1312597-14-gregkh@linuxfoundation.org> (raw) In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> Direct access to the struct bus_type dev_root pointer is going away soon so replace that with a call to bus_get_dev_root() instead, which is what it is there for. Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Nicholas Piggin <npiggin@gmail.com> Cc: Christophe Leroy <christophe.leroy@csgroup.eu> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. .../platforms/pseries/pseries_energy.c | 28 +++++++++++-------- arch/powerpc/platforms/pseries/suspend.c | 10 +++++-- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/arch/powerpc/platforms/pseries/pseries_energy.c b/arch/powerpc/platforms/pseries/pseries_energy.c index 09e98d301db0..2c661b798235 100644 --- a/arch/powerpc/platforms/pseries/pseries_energy.c +++ b/arch/powerpc/platforms/pseries/pseries_energy.c @@ -300,20 +300,22 @@ static struct device_attribute attr_percpu_deactivate_hint = static int __init pseries_energy_init(void) { int cpu, err; - struct device *cpu_dev; + struct device *cpu_dev, *dev_root; if (!firmware_has_feature(FW_FEATURE_BEST_ENERGY)) return 0; /* H_BEST_ENERGY hcall not supported */ /* Create the sysfs files */ - err = device_create_file(cpu_subsys.dev_root, - &attr_cpu_activate_hint_list); - if (!err) - err = device_create_file(cpu_subsys.dev_root, - &attr_cpu_deactivate_hint_list); + dev_root = bus_get_dev_root(&cpu_subsys); + if (dev_root) { + err = device_create_file(dev_root, &attr_cpu_activate_hint_list); + if (!err) + err = device_create_file(dev_root, &attr_cpu_deactivate_hint_list); + put_device(dev_root); + if (err) + return err; + } - if (err) - return err; for_each_possible_cpu(cpu) { cpu_dev = get_cpu_device(cpu); err = device_create_file(cpu_dev, @@ -337,14 +339,18 @@ static int __init pseries_energy_init(void) static void __exit pseries_energy_cleanup(void) { int cpu; - struct device *cpu_dev; + struct device *cpu_dev, *dev_root; if (!sysfs_entries) return; /* Remove the sysfs files */ - device_remove_file(cpu_subsys.dev_root, &attr_cpu_activate_hint_list); - device_remove_file(cpu_subsys.dev_root, &attr_cpu_deactivate_hint_list); + dev_root = bus_get_dev_root(&cpu_subsys); + if (dev_root) { + device_remove_file(dev_root, &attr_cpu_activate_hint_list); + device_remove_file(dev_root, &attr_cpu_deactivate_hint_list); + put_device(dev_root); + } for_each_possible_cpu(cpu) { cpu_dev = get_cpu_device(cpu); diff --git a/arch/powerpc/platforms/pseries/suspend.c b/arch/powerpc/platforms/pseries/suspend.c index 1b902cbf85c5..5c43435472cc 100644 --- a/arch/powerpc/platforms/pseries/suspend.c +++ b/arch/powerpc/platforms/pseries/suspend.c @@ -143,6 +143,7 @@ static const struct platform_suspend_ops pseries_suspend_ops = { **/ static int pseries_suspend_sysfs_register(struct device *dev) { + struct device *dev_root; int rc; if ((rc = subsys_system_register(&suspend_subsys, NULL))) @@ -151,8 +152,13 @@ static int pseries_suspend_sysfs_register(struct device *dev) dev->id = 0; dev->bus = &suspend_subsys; - if ((rc = device_create_file(suspend_subsys.dev_root, &dev_attr_hibernate))) - goto subsys_unregister; + dev_root = bus_get_dev_root(&suspend_subsys); + if (dev_root) { + rc = device_create_file(dev_root, &dev_attr_hibernate); + put_device(dev_root); + if (rc) + goto subsys_unregister; + } return 0; -- 2.39.2
WARNING: multiple messages have this Message-ID (diff)
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: rafael@kernel.org, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Nicholas Piggin <npiggin@gmail.com>, linuxppc-dev@lists.ozlabs.org Subject: [PATCH 14/36] powerpc/pseries: move to use bus_get_dev_root() Date: Mon, 13 Mar 2023 19:28:56 +0100 [thread overview] Message-ID: <20230313182918.1312597-14-gregkh@linuxfoundation.org> (raw) In-Reply-To: <20230313182918.1312597-1-gregkh@linuxfoundation.org> Direct access to the struct bus_type dev_root pointer is going away soon so replace that with a call to bus_get_dev_root() instead, which is what it is there for. Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Nicholas Piggin <npiggin@gmail.com> Cc: Christophe Leroy <christophe.leroy@csgroup.eu> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- Note, this is a patch that is a prepatory cleanup as part of a larger series of patches that is working on resolving some old driver core design mistakes. It will build and apply cleanly on top of 6.3-rc2 on its own, but I'd prefer if I could take it through my driver-core tree so that the driver core changes can be taken through there for 6.4-rc1. .../platforms/pseries/pseries_energy.c | 28 +++++++++++-------- arch/powerpc/platforms/pseries/suspend.c | 10 +++++-- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/arch/powerpc/platforms/pseries/pseries_energy.c b/arch/powerpc/platforms/pseries/pseries_energy.c index 09e98d301db0..2c661b798235 100644 --- a/arch/powerpc/platforms/pseries/pseries_energy.c +++ b/arch/powerpc/platforms/pseries/pseries_energy.c @@ -300,20 +300,22 @@ static struct device_attribute attr_percpu_deactivate_hint = static int __init pseries_energy_init(void) { int cpu, err; - struct device *cpu_dev; + struct device *cpu_dev, *dev_root; if (!firmware_has_feature(FW_FEATURE_BEST_ENERGY)) return 0; /* H_BEST_ENERGY hcall not supported */ /* Create the sysfs files */ - err = device_create_file(cpu_subsys.dev_root, - &attr_cpu_activate_hint_list); - if (!err) - err = device_create_file(cpu_subsys.dev_root, - &attr_cpu_deactivate_hint_list); + dev_root = bus_get_dev_root(&cpu_subsys); + if (dev_root) { + err = device_create_file(dev_root, &attr_cpu_activate_hint_list); + if (!err) + err = device_create_file(dev_root, &attr_cpu_deactivate_hint_list); + put_device(dev_root); + if (err) + return err; + } - if (err) - return err; for_each_possible_cpu(cpu) { cpu_dev = get_cpu_device(cpu); err = device_create_file(cpu_dev, @@ -337,14 +339,18 @@ static int __init pseries_energy_init(void) static void __exit pseries_energy_cleanup(void) { int cpu; - struct device *cpu_dev; + struct device *cpu_dev, *dev_root; if (!sysfs_entries) return; /* Remove the sysfs files */ - device_remove_file(cpu_subsys.dev_root, &attr_cpu_activate_hint_list); - device_remove_file(cpu_subsys.dev_root, &attr_cpu_deactivate_hint_list); + dev_root = bus_get_dev_root(&cpu_subsys); + if (dev_root) { + device_remove_file(dev_root, &attr_cpu_activate_hint_list); + device_remove_file(dev_root, &attr_cpu_deactivate_hint_list); + put_device(dev_root); + } for_each_possible_cpu(cpu) { cpu_dev = get_cpu_device(cpu); diff --git a/arch/powerpc/platforms/pseries/suspend.c b/arch/powerpc/platforms/pseries/suspend.c index 1b902cbf85c5..5c43435472cc 100644 --- a/arch/powerpc/platforms/pseries/suspend.c +++ b/arch/powerpc/platforms/pseries/suspend.c @@ -143,6 +143,7 @@ static const struct platform_suspend_ops pseries_suspend_ops = { **/ static int pseries_suspend_sysfs_register(struct device *dev) { + struct device *dev_root; int rc; if ((rc = subsys_system_register(&suspend_subsys, NULL))) @@ -151,8 +152,13 @@ static int pseries_suspend_sysfs_register(struct device *dev) dev->id = 0; dev->bus = &suspend_subsys; - if ((rc = device_create_file(suspend_subsys.dev_root, &dev_attr_hibernate))) - goto subsys_unregister; + dev_root = bus_get_dev_root(&suspend_subsys); + if (dev_root) { + rc = device_create_file(dev_root, &dev_attr_hibernate); + put_device(dev_root); + if (rc) + goto subsys_unregister; + } return 0; -- 2.39.2
next prev parent reply other threads:[~2023-03-13 18:30 UTC|newest] Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-03-13 18:28 [PATCH 01/36] EDAC/sysfs: move to use bus_get_dev_root() Greg Kroah-Hartman 2023-03-13 18:28 ` [PATCH 02/36] ACPI: LPIT: " Greg Kroah-Hartman 2023-03-13 18:43 ` Rafael J. Wysocki 2023-03-17 14:50 ` Greg Kroah-Hartman 2023-03-22 8:36 ` [PATCH v2 02/19] " Greg Kroah-Hartman 2023-03-22 14:15 ` Rafael J. Wysocki 2023-03-13 18:28 ` [PATCH 03/36] cpufreq: " Greg Kroah-Hartman 2023-03-13 18:45 ` Rafael J. Wysocki 2023-03-13 18:28 ` [PATCH 04/36] platform/x86: ibm_rtl: " Greg Kroah-Hartman 2023-03-15 12:46 ` Hans de Goede 2023-03-13 18:28 ` [PATCH 05/36] platform/x86: intel-uncore-freq: " Greg Kroah-Hartman 2023-03-13 19:14 ` srinivas pandruvada 2023-03-15 12:46 ` Hans de Goede 2023-03-13 18:28 ` [PATCH 06/36] cpuidle: " Greg Kroah-Hartman 2023-03-13 18:58 ` Rafael J. Wysocki 2023-03-22 9:04 ` Greg Kroah-Hartman 2023-03-22 9:05 ` [PATCH v2 03/19] " Greg Kroah-Hartman 2023-03-22 14:27 ` Rafael J. Wysocki 2023-03-24 8:56 ` Greg Kroah-Hartman 2023-03-13 18:28 ` [PATCH 07/36] cpu/hotplug: " Greg Kroah-Hartman 2023-03-20 13:59 ` Thomas Gleixner 2023-03-13 18:28 ` [PATCH 08/36] workqueue: " Greg Kroah-Hartman 2023-03-14 3:31 ` Tejun Heo 2023-03-13 18:28 ` [PATCH 09/36] x86/microcode: " Greg Kroah-Hartman 2023-03-13 18:28 ` [PATCH 10/36] x86/umwait: " Greg Kroah-Hartman 2023-03-13 18:28 ` [PATCH 11/36] arm64: cpufeature: " Greg Kroah-Hartman 2023-03-13 18:28 ` Greg Kroah-Hartman 2023-03-13 18:28 ` [PATCH 12/36] powerpc/sysfs: " Greg Kroah-Hartman 2023-03-13 18:28 ` Greg Kroah-Hartman 2023-03-13 18:28 ` [PATCH 13/36] powerpc/powernv: " Greg Kroah-Hartman 2023-03-13 18:28 ` Greg Kroah-Hartman 2023-03-13 18:28 ` Greg Kroah-Hartman [this message] 2023-03-13 18:28 ` [PATCH 14/36] powerpc/pseries: " Greg Kroah-Hartman 2023-03-15 2:00 ` Michael Ellerman 2023-03-15 2:00 ` Michael Ellerman 2023-03-13 18:28 ` [PATCH 15/36] powerpc/fsl: " Greg Kroah-Hartman 2023-03-13 18:28 ` Greg Kroah-Hartman 2023-03-13 18:28 ` [PATCH 16/36] sh: dma-sysfs: " Greg Kroah-Hartman 2023-03-13 18:38 ` John Paul Adrian Glaubitz 2023-03-13 18:48 ` John Paul Adrian Glaubitz 2023-03-13 18:28 ` [PATCH 17/36] sh: intc: " Greg Kroah-Hartman 2023-03-13 18:39 ` John Paul Adrian Glaubitz 2023-03-13 18:29 ` [PATCH 18/36] s390/topology: " Greg Kroah-Hartman 2023-03-14 11:34 ` Heiko Carstens 2023-03-13 18:29 ` [PATCH 19/36] s390/smp: " Greg Kroah-Hartman 2023-03-14 11:35 ` Heiko Carstens 2023-03-13 18:29 ` [PATCH 20/36] cpufreq: amd-pstate: " Greg Kroah-Hartman 2023-03-14 6:04 ` Huang Rui 2023-03-13 18:29 ` [PATCH 21/36] irqchip/mbigen: " Greg Kroah-Hartman 2023-03-13 18:29 ` [PATCH 22/36] driver core: bus: move dev_root out of struct bus_type Greg Kroah-Hartman 2023-03-13 18:29 ` [PATCH 23/36] driver core: bus: mark the struct bus_type for sysfs callbacks as constant Greg Kroah-Hartman 2023-03-13 19:14 ` Bjorn Helgaas 2023-03-13 22:41 ` Wei Liu 2023-03-13 23:01 ` Ira Weiny 2023-03-14 7:10 ` Harald Freudenberger 2023-03-14 17:43 ` Dan Williams 2023-03-15 2:33 ` Martin K. Petersen 2023-03-15 11:10 ` Ilya Dryomov 2023-03-15 11:51 ` Alex Shi 2023-03-15 15:05 ` Winiarska, Iwona 2023-03-13 18:29 ` [PATCH 24/36] driver core: bus: constantify bus_register() Greg Kroah-Hartman 2023-03-13 18:29 ` [PATCH 25/36] driver core: bus: constify bus_rescan_devices() Greg Kroah-Hartman 2023-03-13 18:29 ` [PATCH 26/36] driver core: bus: constify driver_find() Greg Kroah-Hartman 2023-03-13 18:29 ` [PATCH 27/36] driver core: bus: constify bus_get() Greg Kroah-Hartman 2023-03-13 18:29 ` [PATCH 28/36] driver core: make the bus_type in struct device_driver constant Greg Kroah-Hartman 2023-03-13 18:29 ` [PATCH 29/36] crypto: hisilicon/qm - make struct bus_type * const Greg Kroah-Hartman 2023-03-14 8:22 ` Herbert Xu 2023-03-13 18:29 ` [PATCH 30/36] drm/i915/huc: use const struct bus_type pointers Greg Kroah-Hartman 2023-03-13 18:29 ` Greg Kroah-Hartman 2023-03-13 18:29 ` [Intel-gfx] " Greg Kroah-Hartman 2023-03-15 10:15 ` Tvrtko Ursulin 2023-03-15 10:15 ` Tvrtko Ursulin 2023-03-15 10:15 ` [Intel-gfx] " Tvrtko Ursulin 2023-03-13 18:29 ` [PATCH 31/36] vhost-vdpa: vhost_vdpa_alloc_domain() should be using a const struct bus_type * Greg Kroah-Hartman 2023-03-13 18:29 ` Greg Kroah-Hartman 2023-03-13 18:29 ` [PATCH 32/36] dmaengine: idxd: use " Greg Kroah-Hartman 2023-03-13 19:07 ` Fenghua Yu 2023-03-16 10:16 ` Greg Kroah-Hartman 2023-03-16 23:57 ` Fenghua Yu 2023-03-24 8:57 ` Greg Kroah-Hartman 2023-03-17 17:19 ` Vinod Koul 2023-03-17 17:33 ` Dave Jiang 2023-03-13 18:29 ` [PATCH 33/36] ARM/dma-mapping: const a pointer to bus_type in arm_iommu_create_mapping() Greg Kroah-Hartman 2023-03-13 18:29 ` Greg Kroah-Hartman 2023-03-13 18:29 ` [PATCH 34/36] iommu: make the pointer to struct bus_type constant Greg Kroah-Hartman 2023-03-22 12:13 ` Joerg Roedel 2023-03-13 18:29 ` [PATCH 35/36] driver core: device.h: make struct bus_type a const * Greg Kroah-Hartman 2023-03-13 18:29 ` [PATCH 36/36] USB: mark all struct bus_type as const Greg Kroah-Hartman 2023-03-14 8:48 ` Heikki Krogerus
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230313182918.1312597-14-gregkh@linuxfoundation.org \ --to=gregkh@linuxfoundation.org \ --cc=christophe.leroy@csgroup.eu \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mpe@ellerman.id.au \ --cc=npiggin@gmail.com \ --cc=rafael@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.