* [PATCH 04/36] platform/x86: ibm_rtl: move to use bus_get_dev_root() [not found] <20230313182918.1312597-1-gregkh@linuxfoundation.org> @ 2023-03-13 18:28 ` 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 1 sibling, 1 reply; 5+ messages in thread From: Greg Kroah-Hartman @ 2023-03-13 18:28 UTC (permalink / raw) To: linux-kernel Cc: rafael, Greg Kroah-Hartman, Hans de Goede, Mark Gross, platform-driver-x86 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: Hans de Goede <hdegoede@redhat.com> Cc: Mark Gross <markgross@kernel.org> Cc: platform-driver-x86@vger.kernel.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. drivers/platform/x86/ibm_rtl.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c index 5fc665f7d9b3..2ab7d9ac542d 100644 --- a/drivers/platform/x86/ibm_rtl.c +++ b/drivers/platform/x86/ibm_rtl.c @@ -199,16 +199,26 @@ static int rtl_setup_sysfs(void) { ret = subsys_system_register(&rtl_subsys, NULL); if (!ret) { - for (i = 0; rtl_attributes[i]; i ++) - device_create_file(rtl_subsys.dev_root, rtl_attributes[i]); + struct device *dev_root = bus_get_dev_root(&rtl_subsys); + + if (dev_root) { + for (i = 0; rtl_attributes[i]; i ++) + device_create_file(dev_root, rtl_attributes[i]); + put_device(dev_root); + } } return ret; } static void rtl_teardown_sysfs(void) { + struct device *dev_root = bus_get_dev_root(&rtl_subsys); int i; - for (i = 0; rtl_attributes[i]; i ++) - device_remove_file(rtl_subsys.dev_root, rtl_attributes[i]); + + if (dev_root) { + for (i = 0; rtl_attributes[i]; i ++) + device_remove_file(dev_root, rtl_attributes[i]); + put_device(dev_root); + } bus_unregister(&rtl_subsys); } -- 2.39.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 04/36] platform/x86: ibm_rtl: move to use bus_get_dev_root() 2023-03-13 18:28 ` [PATCH 04/36] platform/x86: ibm_rtl: move to use bus_get_dev_root() Greg Kroah-Hartman @ 2023-03-15 12:46 ` Hans de Goede 0 siblings, 0 replies; 5+ messages in thread From: Hans de Goede @ 2023-03-15 12:46 UTC (permalink / raw) To: Greg Kroah-Hartman, linux-kernel; +Cc: rafael, Mark Gross, platform-driver-x86 Hi, On 3/13/23 19:28, Greg Kroah-Hartman wrote: > 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: Hans de Goede <hdegoede@redhat.com> > Cc: Mark Gross <markgross@kernel.org> > Cc: platform-driver-x86@vger.kernel.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. Taking this upstream through the driver-core tree is fine by me: Acked-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans > drivers/platform/x86/ibm_rtl.c | 18 ++++++++++++++---- > 1 file changed, 14 insertions(+), 4 deletions(-) > > diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c > index 5fc665f7d9b3..2ab7d9ac542d 100644 > --- a/drivers/platform/x86/ibm_rtl.c > +++ b/drivers/platform/x86/ibm_rtl.c > @@ -199,16 +199,26 @@ static int rtl_setup_sysfs(void) { > > ret = subsys_system_register(&rtl_subsys, NULL); > if (!ret) { > - for (i = 0; rtl_attributes[i]; i ++) > - device_create_file(rtl_subsys.dev_root, rtl_attributes[i]); > + struct device *dev_root = bus_get_dev_root(&rtl_subsys); > + > + if (dev_root) { > + for (i = 0; rtl_attributes[i]; i ++) > + device_create_file(dev_root, rtl_attributes[i]); > + put_device(dev_root); > + } > } > return ret; > } > > static void rtl_teardown_sysfs(void) { > + struct device *dev_root = bus_get_dev_root(&rtl_subsys); > int i; > - for (i = 0; rtl_attributes[i]; i ++) > - device_remove_file(rtl_subsys.dev_root, rtl_attributes[i]); > + > + if (dev_root) { > + for (i = 0; rtl_attributes[i]; i ++) > + device_remove_file(dev_root, rtl_attributes[i]); > + put_device(dev_root); > + } > bus_unregister(&rtl_subsys); > } > ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 05/36] platform/x86: intel-uncore-freq: move to use bus_get_dev_root() [not found] <20230313182918.1312597-1-gregkh@linuxfoundation.org> 2023-03-13 18:28 ` [PATCH 04/36] platform/x86: ibm_rtl: move to use bus_get_dev_root() Greg Kroah-Hartman @ 2023-03-13 18:28 ` Greg Kroah-Hartman 2023-03-13 19:14 ` srinivas pandruvada 2023-03-15 12:46 ` Hans de Goede 1 sibling, 2 replies; 5+ messages in thread From: Greg Kroah-Hartman @ 2023-03-13 18:28 UTC (permalink / raw) To: linux-kernel Cc: rafael, Greg Kroah-Hartman, Srinivas Pandruvada, Hans de Goede, Mark Gross, platform-driver-x86 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: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Cc: Hans de Goede <hdegoede@redhat.com> Cc: Mark Gross <markgross@kernel.org> Cc: platform-driver-x86@vger.kernel.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. .../intel/uncore-frequency/uncore-frequency-common.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c index cb24de9e97dc..1a300e14f350 100644 --- a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c +++ b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c @@ -224,9 +224,15 @@ int uncore_freq_common_init(int (*read_control_freq)(struct uncore_data *data, u uncore_write = write_control_freq; uncore_read_freq = read_freq; - if (!uncore_root_kobj) - uncore_root_kobj = kobject_create_and_add("intel_uncore_frequency", - &cpu_subsys.dev_root->kobj); + if (!uncore_root_kobj) { + struct device *dev_root = bus_get_dev_root(&cpu_subsys); + + if (dev_root) { + uncore_root_kobj = kobject_create_and_add("intel_uncore_frequency", + &dev_root->kobj); + put_device(dev_root); + } + } if (uncore_root_kobj) ++uncore_instance_count; mutex_unlock(&uncore_lock); -- 2.39.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 05/36] platform/x86: intel-uncore-freq: move to use bus_get_dev_root() 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 1 sibling, 0 replies; 5+ messages in thread From: srinivas pandruvada @ 2023-03-13 19:14 UTC (permalink / raw) To: Greg Kroah-Hartman, linux-kernel Cc: rafael, Hans de Goede, Mark Gross, platform-driver-x86 On Mon, 2023-03-13 at 19:28 +0100, Greg Kroah-Hartman wrote: > 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: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> > Cc: Hans de Goede <hdegoede@redhat.com> > Cc: Mark Gross <markgross@kernel.org> > Cc: platform-driver-x86@vger.kernel.org > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> > --- > 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. > > .../intel/uncore-frequency/uncore-frequency-common.c | 12 +++++++++- > -- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/drivers/platform/x86/intel/uncore-frequency/uncore- > frequency-common.c b/drivers/platform/x86/intel/uncore- > frequency/uncore-frequency-common.c > index cb24de9e97dc..1a300e14f350 100644 > --- a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency- > common.c > +++ b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency- > common.c > @@ -224,9 +224,15 @@ int uncore_freq_common_init(int > (*read_control_freq)(struct uncore_data *data, u > uncore_write = write_control_freq; > uncore_read_freq = read_freq; > > - if (!uncore_root_kobj) > - uncore_root_kobj = > kobject_create_and_add("intel_uncore_frequency", > - > &cpu_subsys.dev_root->kobj); > + if (!uncore_root_kobj) { > + struct device *dev_root = > bus_get_dev_root(&cpu_subsys); > + > + if (dev_root) { > + uncore_root_kobj = > kobject_create_and_add("intel_uncore_frequency", > + > &dev_root->kobj); > + put_device(dev_root); > + } > + } > if (uncore_root_kobj) > ++uncore_instance_count; > mutex_unlock(&uncore_lock); ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 05/36] platform/x86: intel-uncore-freq: move to use bus_get_dev_root() 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 1 sibling, 0 replies; 5+ messages in thread From: Hans de Goede @ 2023-03-15 12:46 UTC (permalink / raw) To: Greg Kroah-Hartman, linux-kernel Cc: rafael, Srinivas Pandruvada, Mark Gross, platform-driver-x86 Hi, On 3/13/23 19:28, Greg Kroah-Hartman wrote: > 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: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> > Cc: Hans de Goede <hdegoede@redhat.com> > Cc: Mark Gross <markgross@kernel.org> > Cc: platform-driver-x86@vger.kernel.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. Taking this upstream through the driver-core tree is fine by me: Acked-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans > diff --git a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c > index cb24de9e97dc..1a300e14f350 100644 > --- a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c > +++ b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c > @@ -224,9 +224,15 @@ int uncore_freq_common_init(int (*read_control_freq)(struct uncore_data *data, u > uncore_write = write_control_freq; > uncore_read_freq = read_freq; > > - if (!uncore_root_kobj) > - uncore_root_kobj = kobject_create_and_add("intel_uncore_frequency", > - &cpu_subsys.dev_root->kobj); > + if (!uncore_root_kobj) { > + struct device *dev_root = bus_get_dev_root(&cpu_subsys); > + > + if (dev_root) { > + uncore_root_kobj = kobject_create_and_add("intel_uncore_frequency", > + &dev_root->kobj); > + put_device(dev_root); > + } > + } > if (uncore_root_kobj) > ++uncore_instance_count; > mutex_unlock(&uncore_lock); ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-03-15 12:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20230313182918.1312597-1-gregkh@linuxfoundation.org>
2023-03-13 18:28 ` [PATCH 04/36] platform/x86: ibm_rtl: move to use bus_get_dev_root() 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
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).