@@ -1215,12 +1215,12 @@ void acpi_pci_add_bus(struct pci_bus *bus)
1215
1215
if (!pci_is_root_bus (bus ))
1216
1216
return ;
1217
1217
1218
- obj = acpi_evaluate_dsm (ACPI_HANDLE (bus -> bridge ), & pci_acpi_dsm_guid , 3 ,
1219
- DSM_PCI_POWER_ON_RESET_DELAY , NULL );
1218
+ obj = acpi_evaluate_dsm_typed (ACPI_HANDLE (bus -> bridge ), & pci_acpi_dsm_guid , 3 ,
1219
+ DSM_PCI_POWER_ON_RESET_DELAY , NULL , ACPI_TYPE_INTEGER );
1220
1220
if (!obj )
1221
1221
return ;
1222
1222
1223
- if (obj -> type == ACPI_TYPE_INTEGER && obj -> integer .value == 1 ) {
1223
+ if (obj -> integer .value == 1 ) {
1224
1224
bridge = pci_find_host_bridge (bus );
1225
1225
bridge -> ignore_reset_delay = 1 ;
1226
1226
}
@@ -1376,12 +1376,13 @@ static void pci_acpi_optimize_delay(struct pci_dev *pdev,
1376
1376
if (bridge -> ignore_reset_delay )
1377
1377
pdev -> d3cold_delay = 0 ;
1378
1378
1379
- obj = acpi_evaluate_dsm (handle , & pci_acpi_dsm_guid , 3 ,
1380
- DSM_PCI_DEVICE_READINESS_DURATIONS , NULL );
1379
+ obj = acpi_evaluate_dsm_typed (handle , & pci_acpi_dsm_guid , 3 ,
1380
+ DSM_PCI_DEVICE_READINESS_DURATIONS , NULL ,
1381
+ ACPI_TYPE_PACKAGE );
1381
1382
if (!obj )
1382
1383
return ;
1383
1384
1384
- if (obj -> type == ACPI_TYPE_PACKAGE && obj -> package .count == 5 ) {
1385
+ if (obj -> package .count == 5 ) {
1385
1386
elements = obj -> package .elements ;
1386
1387
if (elements [0 ].type == ACPI_TYPE_INTEGER ) {
1387
1388
value = (int )elements [0 ].integer .value / 1000 ;
0 commit comments