PCI: PM: Simplify acpi_pci_power_manageable()

rafaeljw · rafaeljw · commit f09183712146 · 2021-10-05T15:26:23.000+02:00
Make acpi_pci_power_manageable() more straightforward.

No functional impact.

Signed-off-by: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;
Tested-by: Ferry Toth &lt;fntoth@gmail.com&gt;
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
@@ -972,9 +972,7 @@ bool acpi_pci_power_manageable(struct pci_dev *dev)
 {
 	struct acpi_device *adev = ACPI_COMPANION(&dev->dev);
 
-	if (!adev)
-		return false;
-	return acpi_device_power_manageable(adev);
+	return adev && acpi_device_power_manageable(adev);
 }
 
 bool acpi_pci_bridge_d3(struct pci_dev *dev)

Original file line number	Diff line number	Diff line change
`@@ -972,9 +972,7 @@ bool acpi_pci_power_manageable(struct pci_dev *dev)`
`972`	`972`	`{`
`973`	`973`	`struct acpi_device *adev = ACPI_COMPANION(&dev->dev);`
`974`	`974`
`975`		`- if (!adev)`
`976`		`- return false;`
`977`		`- return acpi_device_power_manageable(adev);`
	`975`	`+ return adev && acpi_device_power_manageable(adev);`
`978`	`976`	`}`
`979`	`977`
`980`	`978`	`bool acpi_pci_bridge_d3(struct pci_dev *dev)`