From aa090cb6ea696d9b6a2869e16c53bd8b14a0e7d1 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Wed, 13 Sep 2017 16:01:52 -0600 Subject: device: acpi_name() should take a const struct device There's no reason to mutate the struct device when determining the ACPI name for a device. Adjust the function pointer signature and the respective implementations to use const struct device. Change-Id: If5e1f4de36a53646616581b01f47c4e86822c42e Signed-off-by: Aaron Durbin Reviewed-on: https://review.coreboot.org/21527 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh Reviewed-by: Subrata Banik Reviewed-by: Paul Menzel --- src/southbridge/intel/bd82x6x/azalia.c | 2 +- src/southbridge/intel/bd82x6x/lpc.c | 2 +- src/southbridge/intel/bd82x6x/pcie.c | 2 +- src/southbridge/intel/bd82x6x/sata.c | 2 +- src/southbridge/intel/bd82x6x/smbus.c | 2 +- src/southbridge/intel/bd82x6x/usb_ehci.c | 2 +- src/southbridge/intel/bd82x6x/usb_xhci.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/southbridge/intel/bd82x6x') diff --git a/src/southbridge/intel/bd82x6x/azalia.c b/src/southbridge/intel/bd82x6x/azalia.c index 0e974ba53d..9c8eaf6bff 100644 --- a/src/southbridge/intel/bd82x6x/azalia.c +++ b/src/southbridge/intel/bd82x6x/azalia.c @@ -331,7 +331,7 @@ static void azalia_init(struct device *dev) pci_write_config8(dev, 0x43, reg8); } -static const char *azalia_acpi_name(device_t dev) +static const char *azalia_acpi_name(const struct device *dev) { return "HDEF"; } diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c index 901f71be18..3f722192e5 100644 --- a/src/southbridge/intel/bd82x6x/lpc.c +++ b/src/southbridge/intel/bd82x6x/lpc.c @@ -814,7 +814,7 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) fadt->x_gpe1_blk.addrh = 0x0; } -static const char *lpc_acpi_name(device_t dev) +static const char *lpc_acpi_name(const struct device *dev) { return "LPCB"; } diff --git a/src/southbridge/intel/bd82x6x/pcie.c b/src/southbridge/intel/bd82x6x/pcie.c index a3eaba963f..34b7694dcf 100644 --- a/src/southbridge/intel/bd82x6x/pcie.c +++ b/src/southbridge/intel/bd82x6x/pcie.c @@ -285,7 +285,7 @@ static void pch_pciexp_scan_bridge(device_t dev) pch_pcie_pm_late(dev); } -static const char *pch_pcie_acpi_name(device_t dev) +static const char *pch_pcie_acpi_name(const struct device *dev) { ASSERT(dev); diff --git a/src/southbridge/intel/bd82x6x/sata.c b/src/southbridge/intel/bd82x6x/sata.c index ac4945d011..d4268da7c6 100644 --- a/src/southbridge/intel/bd82x6x/sata.c +++ b/src/southbridge/intel/bd82x6x/sata.c @@ -244,7 +244,7 @@ static void sata_set_subsystem(device_t dev, unsigned vendor, unsigned device) } } -static const char *sata_acpi_name(device_t dev) +static const char *sata_acpi_name(const struct device *dev) { return "SATA"; } diff --git a/src/southbridge/intel/bd82x6x/smbus.c b/src/southbridge/intel/bd82x6x/smbus.c index 6cbdef987e..339089054a 100644 --- a/src/southbridge/intel/bd82x6x/smbus.c +++ b/src/southbridge/intel/bd82x6x/smbus.c @@ -100,7 +100,7 @@ static void smbus_read_resources(device_t dev) res = pci_get_resource(dev, PCI_BASE_ADDRESS_0); } -static const char *smbus_acpi_name(device_t dev) +static const char *smbus_acpi_name(const struct device *dev) { return "SBUS"; } diff --git a/src/southbridge/intel/bd82x6x/usb_ehci.c b/src/southbridge/intel/bd82x6x/usb_ehci.c index 42d7a83d98..90b29c4df9 100644 --- a/src/southbridge/intel/bd82x6x/usb_ehci.c +++ b/src/southbridge/intel/bd82x6x/usb_ehci.c @@ -94,7 +94,7 @@ static void usb_ehci_set_subsystem(device_t dev, unsigned vendor, unsigned devic pci_write_config8(dev, 0x80, access_cntl); } -static const char *usb_ehci_acpi_name(device_t dev) +static const char *usb_ehci_acpi_name(const struct device *dev) { switch (dev->path.pci.devfn) { case PCI_DEVFN(0x1a, 0): diff --git a/src/southbridge/intel/bd82x6x/usb_xhci.c b/src/southbridge/intel/bd82x6x/usb_xhci.c index 1aeb8643b3..6acc63bb91 100644 --- a/src/southbridge/intel/bd82x6x/usb_xhci.c +++ b/src/southbridge/intel/bd82x6x/usb_xhci.c @@ -51,7 +51,7 @@ static void usb_xhci_init(struct device *dev) printk(BIOS_DEBUG, "done.\n"); } -static const char *xhci_acpi_name(device_t dev) +static const char *xhci_acpi_name(const struct device *dev) { return "XHC"; } -- cgit v1.2.3