From 338fd9ad305fa9a27d39b344aa458e677b64df50 Mon Sep 17 00:00:00 2001
From: Furquan Shaikh <furquan@google.com>
Date: Fri, 24 Apr 2020 22:57:05 -0700
Subject: device: Constify struct device * parameter to acpi_inject_dsdt
.acpi_inject_dsdt() does not need to modify the device
structure. Hence, this change makes the struct device * parameter to
acpi_inject_dsdt as const.
Change-Id: I3b096d9a5a9d649193e32ea686d5de9f78124997
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40711
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
src/include/device/device.h | 2 +-
src/soc/amd/picasso/acpi.c | 2 +-
src/soc/amd/picasso/include/soc/acpi.h | 2 +-
src/soc/amd/stoneyridge/acpi.c | 2 +-
src/soc/amd/stoneyridge/include/soc/acpi.h | 2 +-
src/soc/intel/baytrail/southcluster.c | 2 +-
src/soc/intel/braswell/acpi.c | 2 +-
src/soc/intel/braswell/include/soc/acpi.h | 2 +-
src/soc/intel/broadwell/lpc.c | 2 +-
src/soc/intel/common/block/acpi/acpi.c | 2 +-
src/soc/intel/common/block/include/intelblocks/acpi.h | 2 +-
src/soc/intel/denverton_ns/acpi.c | 2 +-
src/soc/intel/denverton_ns/include/soc/acpi.h | 2 +-
src/soc/intel/skylake/acpi.c | 2 +-
src/soc/intel/skylake/include/soc/acpi.h | 2 +-
src/soc/intel/xeon_sp/cpx/acpi.c | 2 +-
src/soc/intel/xeon_sp/skx/acpi.c | 2 +-
src/southbridge/intel/bd82x6x/lpc.c | 2 +-
src/southbridge/intel/i82801gx/lpc.c | 2 +-
src/southbridge/intel/i82801ix/lpc.c | 2 +-
src/southbridge/intel/i82801jx/lpc.c | 2 +-
src/southbridge/intel/ibexpeak/lpc.c | 2 +-
src/southbridge/intel/lynxpoint/lpc.c | 2 +-
src/vendorcode/google/chromeos/acpi.c | 2 +-
src/vendorcode/google/chromeos/chromeos.h | 2 +-
25 files changed, 25 insertions(+), 25 deletions(-)
(limited to 'src')
diff --git a/src/include/device/device.h b/src/include/device/device.h
index efa9e8bc58..c21067deeb 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -51,7 +51,7 @@ struct device_operations {
unsigned long (*write_acpi_tables)(const struct device *dev,
unsigned long start, struct acpi_rsdp *rsdp);
void (*acpi_fill_ssdt)(const struct device *dev);
- void (*acpi_inject_dsdt)(struct device *dev);
+ void (*acpi_inject_dsdt)(const struct device *dev);
const char *(*acpi_name)(const struct device *dev);
/* Returns the optional _HID (Hardware ID) */
const char *(*acpi_hid)(const struct device *dev);
diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c
index 85b40ac8a5..8e34c85f52 100644
--- a/src/soc/amd/picasso/acpi.c
+++ b/src/soc/amd/picasso/acpi.c
@@ -267,7 +267,7 @@ static void acpi_create_gnvs(struct global_nvs_t *gnvs)
gnvs->pcnt = dev_count_cpu();
}
-void southbridge_inject_dsdt(struct device *device)
+void southbridge_inject_dsdt(const struct device *device)
{
struct global_nvs_t *gnvs;
diff --git a/src/soc/amd/picasso/include/soc/acpi.h b/src/soc/amd/picasso/include/soc/acpi.h
index bf1651830d..68321fffae 100644
--- a/src/soc/amd/picasso/include/soc/acpi.h
+++ b/src/soc/amd/picasso/include/soc/acpi.h
@@ -13,7 +13,7 @@
unsigned long southbridge_write_acpi_tables(const struct device *device,
unsigned long current, struct acpi_rsdp *rsdp);
-void southbridge_inject_dsdt(struct device *device);
+void southbridge_inject_dsdt(const struct device *device);
const char *soc_acpi_name(const struct device *dev);
diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c
index e486c9c59a..cc9f634959 100644
--- a/src/soc/amd/stoneyridge/acpi.c
+++ b/src/soc/amd/stoneyridge/acpi.c
@@ -272,7 +272,7 @@ static void acpi_create_gnvs(struct global_nvs_t *gnvs)
gnvs->pcnt = dev_count_cpu();
}
-void southbridge_inject_dsdt(struct device *device)
+void southbridge_inject_dsdt(const struct device *device)
{
struct global_nvs_t *gnvs;
diff --git a/src/soc/amd/stoneyridge/include/soc/acpi.h b/src/soc/amd/stoneyridge/include/soc/acpi.h
index d6f9bed406..6a74f22f58 100644
--- a/src/soc/amd/stoneyridge/include/soc/acpi.h
+++ b/src/soc/amd/stoneyridge/include/soc/acpi.h
@@ -19,7 +19,7 @@
unsigned long southbridge_write_acpi_tables(const struct device *device,
unsigned long current, struct acpi_rsdp *rsdp);
-void southbridge_inject_dsdt(struct device *device);
+void southbridge_inject_dsdt(const struct device *device);
const char *soc_acpi_name(const struct device *dev);
diff --git a/src/soc/intel/baytrail/southcluster.c b/src/soc/intel/baytrail/southcluster.c
index 1b0906f789..b40609674f 100644
--- a/src/soc/intel/baytrail/southcluster.c
+++ b/src/soc/intel/baytrail/southcluster.c
@@ -483,7 +483,7 @@ void southcluster_enable_dev(struct device *dev)
}
}
-static void southcluster_inject_dsdt(struct device *device)
+static void southcluster_inject_dsdt(const struct device *device)
{
global_nvs_t *gnvs;
diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c
index 0b68e09316..1c9d6b3e9b 100644
--- a/src/soc/intel/braswell/acpi.c
+++ b/src/soc/intel/braswell/acpi.c
@@ -512,7 +512,7 @@ unsigned long southcluster_write_acpi_tables(const struct device *device, unsign
return current;
}
-void southcluster_inject_dsdt(struct device *device)
+void southcluster_inject_dsdt(const struct device *device)
{
global_nvs_t *gnvs;
diff --git a/src/soc/intel/braswell/include/soc/acpi.h b/src/soc/intel/braswell/include/soc/acpi.h
index 7a58bec8d8..997b7e920c 100644
--- a/src/soc/intel/braswell/include/soc/acpi.h
+++ b/src/soc/intel/braswell/include/soc/acpi.h
@@ -11,7 +11,7 @@ void acpi_create_serialio_ssdt(acpi_header_t *ssdt);
void acpi_fill_in_fadt(acpi_fadt_t *fadt);
unsigned long acpi_madt_irq_overrides(unsigned long current);
void acpi_init_gnvs(global_nvs_t *gnvs);
-void southcluster_inject_dsdt(struct device *device);
+void southcluster_inject_dsdt(const struct device *device);
unsigned long southcluster_write_acpi_tables(const struct device *device,
unsigned long current, struct acpi_rsdp *rsdp);
diff --git a/src/soc/intel/broadwell/lpc.c b/src/soc/intel/broadwell/lpc.c
index 22547fc4bc..af3be9e132 100644
--- a/src/soc/intel/broadwell/lpc.c
+++ b/src/soc/intel/broadwell/lpc.c
@@ -573,7 +573,7 @@ static void pch_lpc_read_resources(struct device *dev)
memset(gnvs, 0, sizeof(global_nvs_t));
}
-static void southcluster_inject_dsdt(struct device *device)
+static void southcluster_inject_dsdt(const struct device *device)
{
global_nvs_t *gnvs;
diff --git a/src/soc/intel/common/block/acpi/acpi.c b/src/soc/intel/common/block/acpi/acpi.c
index 995a51da0b..e426fae95e 100644
--- a/src/soc/intel/common/block/acpi/acpi.c
+++ b/src/soc/intel/common/block/acpi/acpi.c
@@ -243,7 +243,7 @@ __weak void acpi_create_gnvs(struct global_nvs_t *gnvs)
{
}
-void southbridge_inject_dsdt(struct device *device)
+void southbridge_inject_dsdt(const struct device *device)
{
struct global_nvs_t *gnvs;
diff --git a/src/soc/intel/common/block/include/intelblocks/acpi.h b/src/soc/intel/common/block/include/intelblocks/acpi.h
index e1f9bf82b1..cb10f1f10d 100644
--- a/src/soc/intel/common/block/include/intelblocks/acpi.h
+++ b/src/soc/intel/common/block/include/intelblocks/acpi.h
@@ -48,7 +48,7 @@ unsigned long southbridge_write_acpi_tables(const struct device *device,
* Creates acpi gnvs and adds it to the DSDT table.
* GNVS creation is chipset specific and is done in soc specific acpi.c file.
*/
-void southbridge_inject_dsdt(struct device *device);
+void southbridge_inject_dsdt(const struct device *device);
/*
* This function populates the gnvs structure in acpi table.
diff --git a/src/soc/intel/denverton_ns/acpi.c b/src/soc/intel/denverton_ns/acpi.c
index d425879249..6f43288457 100644
--- a/src/soc/intel/denverton_ns/acpi.c
+++ b/src/soc/intel/denverton_ns/acpi.c
@@ -292,7 +292,7 @@ unsigned long southcluster_write_acpi_tables(const struct device *device,
return current;
}
-void southcluster_inject_dsdt(struct device *device)
+void southcluster_inject_dsdt(const struct device *device)
{
global_nvs_t *gnvs;
diff --git a/src/soc/intel/denverton_ns/include/soc/acpi.h b/src/soc/intel/denverton_ns/include/soc/acpi.h
index 9f7e0c3765..ae184e92b0 100644
--- a/src/soc/intel/denverton_ns/include/soc/acpi.h
+++ b/src/soc/intel/denverton_ns/include/soc/acpi.h
@@ -13,7 +13,7 @@ void acpi_init_gnvs(global_nvs_t *gnvs);
unsigned long southcluster_write_acpi_tables(const struct device *device,
unsigned long current,
struct acpi_rsdp *rsdp);
-void southcluster_inject_dsdt(struct device *device);
+void southcluster_inject_dsdt(const struct device *device);
void motherboard_fill_fadt(acpi_fadt_t *fadt);
#endif /* _DENVERTON_NS_ACPI_H_ */
diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c
index aac90c3fd5..5ba683f47b 100644
--- a/src/soc/intel/skylake/acpi.c
+++ b/src/soc/intel/skylake/acpi.c
@@ -641,7 +641,7 @@ unsigned long southbridge_write_acpi_tables(const struct device *device,
return acpi_align_current(current);
}
-void southbridge_inject_dsdt(struct device *device)
+void southbridge_inject_dsdt(const struct device *device)
{
global_nvs_t *gnvs;
diff --git a/src/soc/intel/skylake/include/soc/acpi.h b/src/soc/intel/skylake/include/soc/acpi.h
index 924d9cb20e..f63220e13b 100644
--- a/src/soc/intel/skylake/include/soc/acpi.h
+++ b/src/soc/intel/skylake/include/soc/acpi.h
@@ -16,7 +16,7 @@
void acpi_fill_in_fadt(acpi_fadt_t *fadt);
unsigned long acpi_madt_irq_overrides(unsigned long current);
void acpi_mainboard_gnvs(global_nvs_t *gnvs);
-void southbridge_inject_dsdt(struct device *device);
+void southbridge_inject_dsdt(const struct device *device);
unsigned long southbridge_write_acpi_tables(const struct device *device,
unsigned long current, struct acpi_rsdp *rsdp);
unsigned long northbridge_write_acpi_tables(const struct device *,
diff --git a/src/soc/intel/xeon_sp/cpx/acpi.c b/src/soc/intel/xeon_sp/cpx/acpi.c
index 0ba0069172..0fe471c558 100644
--- a/src/soc/intel/xeon_sp/cpx/acpi.c
+++ b/src/soc/intel/xeon_sp/cpx/acpi.c
@@ -34,7 +34,7 @@ unsigned long acpi_fill_mcfg(unsigned long current)
return current;
}
-void southbridge_inject_dsdt(struct device *device)
+void southbridge_inject_dsdt(const struct device *device)
{
global_nvs_t *gnvs;
diff --git a/src/soc/intel/xeon_sp/skx/acpi.c b/src/soc/intel/xeon_sp/skx/acpi.c
index 8a806be888..9c5c7495f2 100644
--- a/src/soc/intel/xeon_sp/skx/acpi.c
+++ b/src/soc/intel/xeon_sp/skx/acpi.c
@@ -987,7 +987,7 @@ void uncore_inject_dsdt(void)
acpigen_pop_len();
}
-void southbridge_inject_dsdt(struct device *device)
+void southbridge_inject_dsdt(const struct device *device)
{
global_nvs_t *gnvs;
diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c
index 215965e6f2..35d71a4d07 100644
--- a/src/southbridge/intel/bd82x6x/lpc.c
+++ b/src/southbridge/intel/bd82x6x/lpc.c
@@ -661,7 +661,7 @@ static void pch_lpc_enable(struct device *dev)
pch_enable(dev);
}
-static void southbridge_inject_dsdt(struct device *dev)
+static void southbridge_inject_dsdt(const struct device *dev)
{
global_nvs_t *gnvs = cbmem_add (CBMEM_ID_ACPI_GNVS, sizeof(*gnvs));
diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c
index 9b5f5457fc..e54f2bd80f 100644
--- a/src/southbridge/intel/i82801gx/lpc.c
+++ b/src/southbridge/intel/i82801gx/lpc.c
@@ -620,7 +620,7 @@ static void lpc_final(struct device *dev)
outb(POST_OS_BOOT, 0x80);
}
-static void southbridge_inject_dsdt(struct device *dev)
+static void southbridge_inject_dsdt(const struct device *dev)
{
global_nvs_t *gnvs = cbmem_add(CBMEM_ID_ACPI_GNVS, sizeof(*gnvs));
diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c
index a177c6cc64..8765cc1584 100644
--- a/src/southbridge/intel/i82801ix/lpc.c
+++ b/src/southbridge/intel/i82801ix/lpc.c
@@ -470,7 +470,7 @@ static void i82801ix_lpc_read_resources(struct device *dev)
res->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
}
-static void southbridge_inject_dsdt(struct device *dev)
+static void southbridge_inject_dsdt(const struct device *dev)
{
global_nvs_t *gnvs = cbmem_add (CBMEM_ID_ACPI_GNVS, sizeof(*gnvs));
diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c
index 380dca4c30..77a8f7772b 100644
--- a/src/southbridge/intel/i82801jx/lpc.c
+++ b/src/southbridge/intel/i82801jx/lpc.c
@@ -629,7 +629,7 @@ static void i82801jx_lpc_read_resources(struct device *dev)
}
}
-static void southbridge_inject_dsdt(struct device *dev)
+static void southbridge_inject_dsdt(const struct device *dev)
{
global_nvs_t *gnvs = cbmem_add (CBMEM_ID_ACPI_GNVS, sizeof(*gnvs));
diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c
index 242d274932..4edf87e7c5 100644
--- a/src/southbridge/intel/ibexpeak/lpc.c
+++ b/src/southbridge/intel/ibexpeak/lpc.c
@@ -559,7 +559,7 @@ static void pch_lpc_enable(struct device *dev)
pch_enable(dev);
}
-static void southbridge_inject_dsdt(struct device *dev)
+static void southbridge_inject_dsdt(const struct device *dev)
{
global_nvs_t *gnvs = cbmem_add (CBMEM_ID_ACPI_GNVS, sizeof(*gnvs));
diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c
index d44009b00f..b5fb674a26 100644
--- a/src/southbridge/intel/lynxpoint/lpc.c
+++ b/src/southbridge/intel/lynxpoint/lpc.c
@@ -699,7 +699,7 @@ static void pch_lpc_enable(struct device *dev)
pch_enable(dev);
}
-static void southbridge_inject_dsdt(struct device *dev)
+static void southbridge_inject_dsdt(const struct device *dev)
{
global_nvs_t *gnvs;
diff --git a/src/vendorcode/google/chromeos/acpi.c b/src/vendorcode/google/chromeos/acpi.c
index fad1256b0f..abd5b67095 100644
--- a/src/vendorcode/google/chromeos/acpi.c
+++ b/src/vendorcode/google/chromeos/acpi.c
@@ -35,7 +35,7 @@ void chromeos_acpi_gpio_generate(const struct cros_gpio *gpios, size_t num)
acpigen_pop_len();
}
-void chromeos_dsdt_generator(struct device *dev)
+void chromeos_dsdt_generator(const struct device *dev)
{
mainboard_chromeos_acpi_generate();
}
diff --git a/src/vendorcode/google/chromeos/chromeos.h b/src/vendorcode/google/chromeos/chromeos.h
index f7df10f22e..d2d0a7ace3 100644
--- a/src/vendorcode/google/chromeos/chromeos.h
+++ b/src/vendorcode/google/chromeos/chromeos.h
@@ -70,7 +70,7 @@ void chromeos_acpi_gpio_generate(const struct cros_gpio *gpios, size_t num);
*/
void mainboard_chromeos_acpi_generate(void);
#if CONFIG(CHROMEOS)
-void chromeos_dsdt_generator(struct device *dev);
+void chromeos_dsdt_generator(const struct device *dev);
#else
#define chromeos_dsdt_generator NULL
#endif
--
cgit v1.2.3