| Message ID | 10025610.nUPlyArG6x@kreacher |
|---|---|
| State | New |
| Headers | show |
| Series | perf: Replace acpi_bus_get_device() | expand |
Hi Rafael, On Tue, Feb 01, 2022 at 08:10:01PM +0100, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > Replace acpi_bus_get_device() that is going to be dropped with > acpi_fetch_acpi_dev(). > > No intentional functional impact. > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > drivers/perf/thunderx2_pmu.c | 6 ++---- > drivers/perf/xgene_pmu.c | 6 ++---- > 2 files changed, 4 insertions(+), 8 deletions(-) Acked-by: Will Deacon <will@kernel.org> Please let me know if you'd like me to take this for 5.18. Will
On Tue, Feb 8, 2022 at 3:59 PM Will Deacon <will@kernel.org> wrote: > > Hi Rafael, > > On Tue, Feb 01, 2022 at 08:10:01PM +0100, Rafael J. Wysocki wrote: > > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > > > Replace acpi_bus_get_device() that is going to be dropped with > > acpi_fetch_acpi_dev(). > > > > No intentional functional impact. > > > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > --- > > drivers/perf/thunderx2_pmu.c | 6 ++---- > > drivers/perf/xgene_pmu.c | 6 ++---- > > 2 files changed, 4 insertions(+), 8 deletions(-) > > Acked-by: Will Deacon <will@kernel.org> > > Please let me know if you'd like me to take this for 5.18. Yes, please!
On Tue, 01 Feb 2022 20:10:01 +0100, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > Replace acpi_bus_get_device() that is going to be dropped with > acpi_fetch_acpi_dev(). > > No intentional functional impact. > > [...] Applied to will (for-next/perf), thanks! [1/1] perf: Replace acpi_bus_get_device() https://git.kernel.org/will/c/602c873eb52e Cheers,
Index: linux-pm/drivers/perf/thunderx2_pmu.c =================================================================== --- linux-pm.orig/drivers/perf/thunderx2_pmu.c +++ linux-pm/drivers/perf/thunderx2_pmu.c @@ -887,13 +887,11 @@ static struct tx2_uncore_pmu *tx2_uncore static acpi_status tx2_uncore_pmu_add(acpi_handle handle, u32 level, void *data, void **return_value) { + struct acpi_device *adev = acpi_fetch_acpi_dev(handle); struct tx2_uncore_pmu *tx2_pmu; - struct acpi_device *adev; enum tx2_uncore_type type; - if (acpi_bus_get_device(handle, &adev)) - return AE_OK; - if (acpi_bus_get_status(adev) || !adev->status.present) + if (!adev || acpi_bus_get_status(adev) || !adev->status.present) return AE_OK; type = get_tx2_pmu_type(adev); Index: linux-pm/drivers/perf/xgene_pmu.c =================================================================== --- linux-pm.orig/drivers/perf/xgene_pmu.c +++ linux-pm/drivers/perf/xgene_pmu.c @@ -1549,14 +1549,12 @@ static const struct acpi_device_id *xgen static acpi_status acpi_pmu_dev_add(acpi_handle handle, u32 level, void *data, void **return_value) { + struct acpi_device *adev = acpi_fetch_acpi_dev(handle); const struct acpi_device_id *acpi_id; struct xgene_pmu *xgene_pmu = data; struct xgene_pmu_dev_ctx *ctx; - struct acpi_device *adev; - if (acpi_bus_get_device(handle, &adev)) - return AE_OK; - if (acpi_bus_get_status(adev) || !adev->status.present) + if (!adev || acpi_bus_get_status(adev) || !adev->status.present) return AE_OK; acpi_id = xgene_pmu_acpi_match_type(xgene_pmu_acpi_type_match, adev);