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 <adurbin@chromium.org> Reviewed-on: https://review.coreboot.org/21527 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Subrata Banik <subrata.banik@intel.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
@@ -60,7 +60,7 @@ static void gpio_regulator_fill_ssdt_generator(struct device *dev)
|
||||
acpigen_pop_len(); /* Scope */
|
||||
}
|
||||
|
||||
static const char *gpio_regulator_acpi_name(struct device *dev)
|
||||
static const char *gpio_regulator_acpi_name(const struct device *dev)
|
||||
{
|
||||
struct drivers_generic_gpio_regulator_config *config = dev->chip_info;
|
||||
static char name[5];
|
||||
|
@@ -66,7 +66,7 @@ static void max98357a_fill_ssdt(struct device *dev)
|
||||
printk(BIOS_INFO, "%s: %s\n", path, dev->chip_ops->name);
|
||||
}
|
||||
|
||||
static const char *max98357a_acpi_name(struct device *dev)
|
||||
static const char *max98357a_acpi_name(const struct device *dev)
|
||||
{
|
||||
return MAX98357A_ACPI_NAME;
|
||||
}
|
||||
|
@@ -34,7 +34,7 @@ static void i2c_alps_fill_ssdt_generator(struct device *dev)
|
||||
i2c_generic_fill_ssdt(dev, &i2c_alps_fill_dsm, &config->generic);
|
||||
}
|
||||
|
||||
static const char *i2c_alps_acpi_name(struct device *dev)
|
||||
static const char *i2c_alps_acpi_name(const struct device *dev)
|
||||
{
|
||||
return "ALPS";
|
||||
}
|
||||
|
@@ -95,7 +95,7 @@ static void da7219_fill_ssdt(struct device *dev)
|
||||
dev->path.i2c.device, config->irq.pin);
|
||||
}
|
||||
|
||||
static const char *da7219_acpi_name(struct device *dev)
|
||||
static const char *da7219_acpi_name(const struct device *dev)
|
||||
{
|
||||
return DA7219_ACPI_NAME;
|
||||
}
|
||||
|
@@ -165,7 +165,7 @@ static void i2c_generic_fill_ssdt_generator(struct device *dev)
|
||||
}
|
||||
|
||||
/* Use name specified in config or build one from I2C address */
|
||||
static const char *i2c_generic_acpi_name(struct device *dev)
|
||||
static const char *i2c_generic_acpi_name(const struct device *dev)
|
||||
{
|
||||
struct drivers_i2c_generic_config *config = dev->chip_info;
|
||||
static char name[5];
|
||||
|
@@ -37,7 +37,7 @@ static void i2c_hid_fill_ssdt_generator(struct device *dev)
|
||||
i2c_generic_fill_ssdt(dev, &i2c_hid_fill_dsm, &config->generic);
|
||||
}
|
||||
|
||||
static const char *i2c_hid_acpi_name(struct device *dev)
|
||||
static const char *i2c_hid_acpi_name(const struct device *dev)
|
||||
{
|
||||
static char name[5];
|
||||
snprintf(name, sizeof(name), "H%03.3X", dev->path.i2c.device);
|
||||
|
@@ -73,7 +73,7 @@ static void max98927_fill_ssdt(struct device *dev)
|
||||
dev->chip_ops->name, dev->path.i2c.device);
|
||||
}
|
||||
|
||||
static const char *max98927_acpi_name(struct device *dev)
|
||||
static const char *max98927_acpi_name(const struct device *dev)
|
||||
{
|
||||
struct drivers_i2c_max98927_config *config = dev->chip_info;
|
||||
|
||||
|
@@ -92,7 +92,7 @@ static void nau8825_fill_ssdt(struct device *dev)
|
||||
dev->path.i2c.device, config->irq.pin);
|
||||
}
|
||||
|
||||
static const char *nau8825_acpi_name(struct device *dev)
|
||||
static const char *nau8825_acpi_name(const struct device *dev)
|
||||
{
|
||||
return NAU8825_ACPI_NAME;
|
||||
}
|
||||
|
@@ -82,7 +82,7 @@ static void rt5663_fill_ssdt(struct device *dev)
|
||||
dev->chip_ops->name, dev->path.i2c.device);
|
||||
}
|
||||
|
||||
static const char *rt5663_acpi_name(struct device *dev)
|
||||
static const char *rt5663_acpi_name(const struct device *dev)
|
||||
{
|
||||
return RT5663_ACPI_NAME;
|
||||
}
|
||||
|
@@ -65,7 +65,7 @@ static void i2c_tpm_fill_ssdt(struct device *dev)
|
||||
dev->chip_ops->name, dev_path(dev));
|
||||
}
|
||||
|
||||
static const char *i2c_tpm_acpi_name(struct device *dev)
|
||||
static const char *i2c_tpm_acpi_name(const struct device *dev)
|
||||
{
|
||||
return "TPMI";
|
||||
}
|
||||
|
@@ -74,7 +74,7 @@ static void camera_fill_ssdt(struct device *dev)
|
||||
dev->chip_ops->name, dev->path.i2c.device);
|
||||
}
|
||||
|
||||
static const char *camera_acpi_name(struct device *dev)
|
||||
static const char *camera_acpi_name(const struct device *dev)
|
||||
{
|
||||
struct drivers_intel_mipi_camera_config *config = dev->chip_info;
|
||||
return config->acpi_name;
|
||||
|
@@ -195,7 +195,7 @@ static void intel_wifi_fill_ssdt(struct device *dev)
|
||||
dev->chip_ops ? dev->chip_ops->name : "", dev_path(dev));
|
||||
}
|
||||
|
||||
static const char *intel_wifi_acpi_name(struct device *dev)
|
||||
static const char *intel_wifi_acpi_name(const struct device *dev)
|
||||
{
|
||||
return "WIFI";
|
||||
}
|
||||
|
@@ -988,7 +988,7 @@ static void lpc_tpm_fill_ssdt(struct device *dev)
|
||||
dev->chip_ops->name, dev_path(dev));
|
||||
}
|
||||
|
||||
static const char *lpc_tpm_acpi_name(struct device *dev)
|
||||
static const char *lpc_tpm_acpi_name(const struct device *dev)
|
||||
{
|
||||
return "TPM";
|
||||
}
|
||||
|
@@ -24,7 +24,7 @@
|
||||
#include <string.h>
|
||||
#include "chip.h"
|
||||
|
||||
static int spi_acpi_get_bus(struct device *dev)
|
||||
static int spi_acpi_get_bus(const struct device *dev)
|
||||
{
|
||||
struct device *spi_dev;
|
||||
struct device_operations *ops;
|
||||
@@ -178,7 +178,7 @@ static void spi_acpi_fill_ssdt_generator(struct device *dev)
|
||||
config->desc ? : dev->chip_ops->name, dev_path(dev));
|
||||
}
|
||||
|
||||
static const char *spi_acpi_name(struct device *dev)
|
||||
static const char *spi_acpi_name(const struct device *dev)
|
||||
{
|
||||
struct drivers_spi_acpi_config *config = dev->chip_info;
|
||||
static char name[5];
|
||||
|
Reference in New Issue
Block a user