drm/amd: Use pci_dev_id() to simplify the code

PCI core API pci_dev_id() can be used to get the BDF number for a pci
device. We don't need to compose it mannually. Use pci_dev_id() to
simplify the code a little bit.

Signed-off-by: Xiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
index a5a2b06c6588cb24891ea01efd4750fc759b1c90..2bca37044ad0fb762a59dc8dfcbda540e2f50168 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
@@ -706,7 +706,7 @@ int amdgpu_acpi_pcie_performance_request(struct amdgpu_device *adev,
 
        atcs_input.size = sizeof(struct atcs_pref_req_input);
        /* client id (bit 2-0: func num, 7-3: dev num, 15-8: bus num) */
-       atcs_input.client_id = adev->pdev->devfn | (adev->pdev->bus->number << 8);
+       atcs_input.client_id = pci_dev_id(adev->pdev);
        atcs_input.valid_flags_mask = ATCS_VALID_FLAGS_MASK;
        atcs_input.flags = ATCS_WAIT_FOR_COMPLETION;
        if (advertise)
@@ -776,7 +776,7 @@ int amdgpu_acpi_power_shift_control(struct amdgpu_device *adev,
 
        atcs_input.size = sizeof(struct atcs_pwr_shift_input);
        /* dGPU id (bit 2-0: func num, 7-3: dev num, 15-8: bus num) */
-       atcs_input.dgpu_id = adev->pdev->devfn | (adev->pdev->bus->number << 8);
+       atcs_input.dgpu_id = pci_dev_id(adev->pdev);
        atcs_input.dev_acpi_state = dev_state;
        atcs_input.drv_state = drv_state;
 
@@ -1141,7 +1141,7 @@ int amdgpu_acpi_get_tmr_info(struct amdgpu_device *adev, u64 *tmr_offset,
        if (!tmr_offset || !tmr_size)
                return -EINVAL;
 
-       bdf = (adev->pdev->bus->number << 8) | adev->pdev->devfn;
+       bdf = pci_dev_id(adev->pdev);
        dev_info = amdgpu_acpi_get_dev(bdf);
        if (!dev_info)
                return -ENOENT;
@@ -1162,7 +1162,7 @@ int amdgpu_acpi_get_mem_info(struct amdgpu_device *adev, int xcc_id,
        if (!numa_info)
                return -EINVAL;
 
-       bdf = (adev->pdev->bus->number << 8) | adev->pdev->devfn;
+       bdf = pci_dev_id(adev->pdev);
        dev_info = amdgpu_acpi_get_dev(bdf);
        if (!dev_info)
                return -ENOENT;