diff mbox series

[v11,1/7] ACPI: Allow CONFIG_PCI to be unset for reboot

Message ID 20181218025606.32668-2-okaya@kernel.org (mailing list archive)
State Changes Requested, archived
Headers show
Series ACPI: Allow ACPI to be built without CONFIG_PCI set | expand

Commit Message

Sinan Kaya Dec. 18, 2018, 2:56 a.m. UTC 
Make PCI reboot conditional on PCI support being present on the kernel
configuration.

Signed-off-by: Sinan Kaya <okaya@kernel.org>
---
 drivers/acpi/reboot.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Comments

Christoph Hellwig Dec. 18, 2018, 7:31 a.m. UTC | #1 
> +#ifdef CONFIG_PCI
> +		unsigned int devfn;
> +		struct pci_bus *bus0;
> +
>  		/* The reset register can only live on bus 0. */
>  		bus0 = pci_find_bus(0, 0);
>  		if (!bus0)
> @@ -44,8 +47,9 @@ void acpi_reboot(void)
>  		/* Write the value that resets us. */
>  		pci_bus_write_config_byte(bus0, devfn,
>  				(rr->address & 0xffff), reset_value);
> +#endif

This would be a lot cleaner if this was split into a little helper
function.
Sinan Kaya Dec. 19, 2018, 10:21 p.m. UTC | #2 
On 12/18/2018 8:31 AM, Christoph Hellwig wrote:
>> @@ -44,8 +47,9 @@ void acpi_reboot(void)
>>   		/* Write the value that resets us. */
>>   		pci_bus_write_config_byte(bus0, devfn,
>>   				(rr->address & 0xffff), reset_value);
>> +#endif
> This would be a lot cleaner if this was split into a little helper
> function.
> 

done.
diff mbox series

Patch

diff --git a/drivers/acpi/reboot.c b/drivers/acpi/reboot.c
index 6fa9c2a4cfe9..d75e637ee36a 100644
--- a/drivers/acpi/reboot.c
+++ b/drivers/acpi/reboot.c
@@ -7,8 +7,6 @@ 
 void acpi_reboot(void)
 {
 	struct acpi_generic_address *rr;
-	struct pci_bus *bus0;
-	unsigned int devfn;
 	u8 reset_value;
 
 	if (acpi_disabled)
@@ -33,6 +31,11 @@  void acpi_reboot(void)
 	 * on a device on bus 0. */
 	switch (rr->space_id) {
 	case ACPI_ADR_SPACE_PCI_CONFIG:
+	{
+#ifdef CONFIG_PCI
+		unsigned int devfn;
+		struct pci_bus *bus0;
+
 		/* The reset register can only live on bus 0. */
 		bus0 = pci_find_bus(0, 0);
 		if (!bus0)
@@ -44,8 +47,9 @@  void acpi_reboot(void)
 		/* Write the value that resets us. */
 		pci_bus_write_config_byte(bus0, devfn,
 				(rr->address & 0xffff), reset_value);
+#endif
 		break;
-
+	}
 	case ACPI_ADR_SPACE_SYSTEM_MEMORY:
 	case ACPI_ADR_SPACE_SYSTEM_IO:
 		printk(KERN_DEBUG "ACPI MEMORY or I/O RESET_REG.\n");