From 7536a398e978aa8ddb0e5f2ae12bae73a708b68f Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Fri, 24 Apr 2020 21:59:21 -0700 Subject: device: Constify struct device * parameter to acpi_fill_ssdt() .acpi_fill_ssdt() does not need to modify the device structure. This change makes the struct device * parameter to acpi_fill_ssdt() as const. Change-Id: I110f4c67c3b6671c9ac0a82e02609902a8ee5d5c Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/c/coreboot/+/40710 Reviewed-by: HAOUAS Elyes Reviewed-by: Aaron Durbin Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) --- src/superio/common/generic.c | 2 +- src/superio/common/ssdt.c | 10 +++++----- src/superio/common/ssdt.h | 2 +- src/superio/nuvoton/npcd378/superio.c | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src/superio') diff --git a/src/superio/common/generic.c b/src/superio/common/generic.c index 88432ff68d..cffe0c3476 100644 --- a/src/superio/common/generic.c +++ b/src/superio/common/generic.c @@ -31,7 +31,7 @@ static void generic_read_resources(struct device *dev) } #if CONFIG(HAVE_ACPI_TABLES) -static void generic_ssdt(struct device *dev) +static void generic_ssdt(const struct device *dev) { const char *scope = acpi_device_scope(dev); const char *name = acpi_device_name(dev); diff --git a/src/superio/common/ssdt.c b/src/superio/common/ssdt.c index f5ad765aa1..9ff02fb3af 100644 --- a/src/superio/common/ssdt.c +++ b/src/superio/common/ssdt.c @@ -29,7 +29,7 @@ static const struct superio_dev superio_devs[] = { static const u8 io_idx[] = {PNP_IDX_IO0, PNP_IDX_IO1, PNP_IDX_IO2, PNP_IDX_IO3}; static const u8 irq_idx[] = {PNP_IDX_IRQ0, PNP_IDX_IRQ1}; -static const struct superio_dev *superio_guess_function(struct device *dev) +static const struct superio_dev *superio_guess_function(const struct device *dev) { for (size_t i = 0; i < ARRAY_SIZE(io_idx); i++) { struct resource *res = probe_resource(dev, io_idx[i]); @@ -62,7 +62,7 @@ static const struct superio_dev *superio_guess_function(struct device *dev) } /* Return true if there are resources to report */ -static bool has_resources(struct device *dev) +static bool has_resources(const struct device *dev) { for (size_t i = 0; i < ARRAY_SIZE(io_idx); i++) { struct resource *res = probe_resource(dev, io_idx[i]); @@ -80,7 +80,7 @@ static bool has_resources(struct device *dev) } /* Add IO and IRQ resources for _CRS or _PRS */ -static void ldn_gen_resources(struct device *dev) +static void ldn_gen_resources(const struct device *dev) { uint16_t irq = 0; for (size_t i = 0; i < ARRAY_SIZE(io_idx); i++) { @@ -109,7 +109,7 @@ static void ldn_gen_resources(struct device *dev) } /* Add resource base and size for additional SuperIO code */ -static void ldn_gen_resources_use(struct device *dev) +static void ldn_gen_resources_use(const struct device *dev) { char name[5]; for (size_t i = 0; i < ARRAY_SIZE(io_idx); i++) { @@ -161,7 +161,7 @@ static const char *name_from_hid(const char *hid) return "Generic device"; } -void superio_common_fill_ssdt_generator(struct device *dev) +void superio_common_fill_ssdt_generator(const struct device *dev) { if (!dev || !dev->bus || !dev->bus->dev) { printk(BIOS_CRIT, "BUG: Invalid argument in %s!\n", __func__); diff --git a/src/superio/common/ssdt.h b/src/superio/common/ssdt.h index 1f9918950f..5b1efcf8ac 100644 --- a/src/superio/common/ssdt.h +++ b/src/superio/common/ssdt.h @@ -7,6 +7,6 @@ #include const char *superio_common_ldn_acpi_name(const struct device *dev); -void superio_common_fill_ssdt_generator(struct device *dev); +void superio_common_fill_ssdt_generator(const struct device *dev); #endif /* __SUPERIO_COMMON_SSDT_H__ */ diff --git a/src/superio/nuvoton/npcd378/superio.c b/src/superio/nuvoton/npcd378/superio.c index 94b42a02cf..8f5975ba26 100644 --- a/src/superio/nuvoton/npcd378/superio.c +++ b/src/superio/nuvoton/npcd378/superio.c @@ -115,7 +115,7 @@ static const char *npcd378_acpi_hid(const struct device *dev) } } -static void npcd378_ssdt_aux(struct device *dev) +static void npcd378_ssdt_aux(const struct device *dev) { /* Scope */ acpigen_write_scope(acpi_device_path(dev)); @@ -131,7 +131,7 @@ static void npcd378_ssdt_aux(struct device *dev) acpigen_pop_len(); /* Pop Scope */ } -static void npcd378_ssdt_kbc(struct device *dev) +static void npcd378_ssdt_kbc(const struct device *dev) { /* Scope */ acpigen_write_scope(acpi_device_path(dev)); @@ -147,7 +147,7 @@ static void npcd378_ssdt_kbc(struct device *dev) acpigen_pop_len(); /* Pop Scope */ } -static void npcd378_ssdt_pwr(struct device *dev) +static void npcd378_ssdt_pwr(const struct device *dev) { const char *name = acpi_device_path(dev); const char *scope = acpi_device_scope(dev); @@ -403,7 +403,7 @@ static void npcd378_ssdt_pwr(struct device *dev) acpigen_pop_len(); /* Scope */ } -static void npcd378_fill_ssdt_generator(struct device *dev) +static void npcd378_fill_ssdt_generator(const struct device *dev) { superio_common_fill_ssdt_generator(dev); -- cgit v1.2.3