2015-06-13 12:21:08

by Mathias Krause

Subject: [PATCH] mfd: intel_soc_pmic: Constify ACPI device ids

Constify the ACPI device ID array, it doesn't need to be writable at
runtime.

Signed-off-by: Mathias Krause <[email protected]>
Cc: Yang, Bin <[email protected]>
Cc: Zhu, Lejun <[email protected]>
---
drivers/mfd/intel_soc_pmic_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mfd/intel_soc_pmic_core.c b/drivers/mfd/intel_soc_pmic_core.c
index 7b50b6b208a5..27e7552a29dd 100644
--- a/drivers/mfd/intel_soc_pmic_core.c
+++ b/drivers/mfd/intel_soc_pmic_core.c
@@ -147,7 +147,7 @@ static const struct i2c_device_id intel_soc_pmic_i2c_id[] = {
MODULE_DEVICE_TABLE(i2c, intel_soc_pmic_i2c_id);

#if defined(CONFIG_ACPI)
-static struct acpi_device_id intel_soc_pmic_acpi_match[] = {
+static const struct acpi_device_id intel_soc_pmic_acpi_match[] = {
{"INT33FD", (kernel_ulong_t)&intel_soc_pmic_config_crc},
{ },
};
--
1.7.10.4

2015-06-24 11:00:05

by Lee Jones

Subject: Re: [PATCH] mfd: intel_soc_pmic: Constify ACPI device ids

On Sat, 13 Jun 2015, Mathias Krause wrote:

> Constify the ACPI device ID array, it doesn't need to be writable at
> runtime.
>
> Signed-off-by: Mathias Krause <[email protected]>
> Cc: Yang, Bin <[email protected]>
> Cc: Zhu, Lejun <[email protected]>
> ---
> drivers/mfd/intel_soc_pmic_core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Applied for v4.3, thanks.

> diff --git a/drivers/mfd/intel_soc_pmic_core.c b/drivers/mfd/intel_soc_pmic_core.c
> index 7b50b6b208a5..27e7552a29dd 100644
> --- a/drivers/mfd/intel_soc_pmic_core.c
> +++ b/drivers/mfd/intel_soc_pmic_core.c
> @@ -147,7 +147,7 @@ static const struct i2c_device_id intel_soc_pmic_i2c_id[] = {
> MODULE_DEVICE_TABLE(i2c, intel_soc_pmic_i2c_id);
>
> #if defined(CONFIG_ACPI)
> -static struct acpi_device_id intel_soc_pmic_acpi_match[] = {
> +static const struct acpi_device_id intel_soc_pmic_acpi_match[] = {
> {"INT33FD", (kernel_ulong_t)&intel_soc_pmic_config_crc},
> { },
> };

--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog