From: Heiner Kallweit Date: Wed, 24 Apr 2019 19:14:55 +0000 (+0200) Subject: drm/amdkfd: Use pci_dev_id() helper X-Git-Tag: v5.2-rc1~70^2~20^2~5 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=babe2ef342c4829c3875a03a6ecb9716813cbe21;p=linux.git drm/amdkfd: Use pci_dev_id() helper Use new helper pci_dev_id() to simplify the code. Signed-off-by: Heiner Kallweit Signed-off-by: Bjorn Helgaas Acked-by: Christian König --- diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c index 09da91644f9f..b0c59a313049 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c @@ -1270,8 +1270,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu) dev->node_props.vendor_id = gpu->pdev->vendor; dev->node_props.device_id = gpu->pdev->device; - dev->node_props.location_id = PCI_DEVID(gpu->pdev->bus->number, - gpu->pdev->devfn); + dev->node_props.location_id = pci_dev_id(gpu->pdev); dev->node_props.max_engine_clk_fcompute = amdgpu_amdkfd_get_max_engine_clock_in_mhz(dev->gpu->kgd); dev->node_props.max_engine_clk_ccompute =