forked from Minki/linux
perf: Replace acpi_bus_get_device()
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> Acked-by: Will Deacon <will@kernel.org> Link: https://lore.kernel.org/r/10025610.nUPlyArG6x@kreacher Signed-off-by: Will Deacon <will@kernel.org>
This commit is contained in:
parent
8c0c56879d
commit
602c873eb5
@ -887,13 +887,11 @@ static struct tx2_uncore_pmu *tx2_uncore_pmu_init_dev(struct device *dev,
|
||||
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);
|
||||
|
@ -1549,14 +1549,12 @@ static const struct acpi_device_id *xgene_pmu_acpi_match_type(
|
||||
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);
|
||||
|
Loading…
Reference in New Issue
Block a user