| Message ID | 20211126152109.230986-1-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | [1/3] ACPI: PMIC: constify all struct intel_pmic_opregion_data declarations | expand |
On Fri, Nov 26, 2021 at 04:21:07PM +0100, Hans de Goede wrote: > The struct intel_pmic_opregion_data declarations never change, > constify them all. Makes sense! Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com> > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > drivers/acpi/pmic/intel_pmic.c | 12 ++++++------ > drivers/acpi/pmic/intel_pmic.h | 4 +++- > drivers/acpi/pmic/intel_pmic_bxtwc.c | 2 +- > drivers/acpi/pmic/intel_pmic_bytcrc.c | 2 +- > drivers/acpi/pmic/intel_pmic_chtcrc.c | 2 +- > drivers/acpi/pmic/intel_pmic_chtdc_ti.c | 2 +- > drivers/acpi/pmic/intel_pmic_chtwc.c | 2 +- > drivers/acpi/pmic/intel_pmic_xpower.c | 2 +- > 8 files changed, 15 insertions(+), 13 deletions(-) > > diff --git a/drivers/acpi/pmic/intel_pmic.c b/drivers/acpi/pmic/intel_pmic.c > index 9cde299eba88..98bbfd99c709 100644 > --- a/drivers/acpi/pmic/intel_pmic.c > +++ b/drivers/acpi/pmic/intel_pmic.c > @@ -25,7 +25,7 @@ struct intel_pmic_opregion { > struct mutex lock; > struct acpi_lpat_conversion_table *lpat_table; > struct regmap *regmap; > - struct intel_pmic_opregion_data *data; > + const struct intel_pmic_opregion_data *data; > struct intel_pmic_regs_handler_ctx ctx; > }; > > @@ -53,7 +53,7 @@ static acpi_status intel_pmic_power_handler(u32 function, > { > struct intel_pmic_opregion *opregion = region_context; > struct regmap *regmap = opregion->regmap; > - struct intel_pmic_opregion_data *d = opregion->data; > + const struct intel_pmic_opregion_data *d = opregion->data; > int reg, bit, result; > > if (bits != 32 || !value64) > @@ -135,7 +135,7 @@ static int pmic_thermal_aux(struct intel_pmic_opregion *opregion, int reg, > static int pmic_thermal_pen(struct intel_pmic_opregion *opregion, int reg, > int bit, u32 function, u64 *value) > { > - struct intel_pmic_opregion_data *d = opregion->data; > + const struct intel_pmic_opregion_data *d = opregion->data; > struct regmap *regmap = opregion->regmap; > > if (!d->get_policy || !d->update_policy) > @@ -171,7 +171,7 @@ static acpi_status intel_pmic_thermal_handler(u32 function, > void *handler_context, void *region_context) > { > struct intel_pmic_opregion *opregion = region_context; > - struct intel_pmic_opregion_data *d = opregion->data; > + const struct intel_pmic_opregion_data *d = opregion->data; > int reg, bit, result; > > if (bits != 32 || !value64) > @@ -255,7 +255,7 @@ static acpi_status intel_pmic_regs_handler(u32 function, > > int intel_pmic_install_opregion_handler(struct device *dev, acpi_handle handle, > struct regmap *regmap, > - struct intel_pmic_opregion_data *d) > + const struct intel_pmic_opregion_data *d) > { > acpi_status status = AE_OK; > struct intel_pmic_opregion *opregion; > @@ -344,7 +344,7 @@ EXPORT_SYMBOL_GPL(intel_pmic_install_opregion_handler); > int intel_soc_pmic_exec_mipi_pmic_seq_element(u16 i2c_address, u32 reg_address, > u32 value, u32 mask) > { > - struct intel_pmic_opregion_data *d; > + const struct intel_pmic_opregion_data *d; > int ret; > > if (!intel_pmic_opregion) { > diff --git a/drivers/acpi/pmic/intel_pmic.h b/drivers/acpi/pmic/intel_pmic.h > index 89379476a1df..467a39966dc8 100644 > --- a/drivers/acpi/pmic/intel_pmic.h > +++ b/drivers/acpi/pmic/intel_pmic.h > @@ -25,6 +25,8 @@ struct intel_pmic_opregion_data { > int pmic_i2c_address; > }; > > -int intel_pmic_install_opregion_handler(struct device *dev, acpi_handle handle, struct regmap *regmap, struct intel_pmic_opregion_data *d); > +int intel_pmic_install_opregion_handler(struct device *dev, acpi_handle handle, > + struct regmap *regmap, > + const struct intel_pmic_opregion_data *d); > > #endif > diff --git a/drivers/acpi/pmic/intel_pmic_bxtwc.c b/drivers/acpi/pmic/intel_pmic_bxtwc.c > index bd7621edd60b..6620ce0833f6 100644 > --- a/drivers/acpi/pmic/intel_pmic_bxtwc.c > +++ b/drivers/acpi/pmic/intel_pmic_bxtwc.c > @@ -369,7 +369,7 @@ intel_bxtwc_pmic_update_policy(struct regmap *regmap, > return regmap_update_bits(regmap, reg, mask, val); > } > > -static struct intel_pmic_opregion_data intel_bxtwc_pmic_opregion_data = { > +static const struct intel_pmic_opregion_data intel_bxtwc_pmic_opregion_data = { > .get_power = intel_bxtwc_pmic_get_power, > .update_power = intel_bxtwc_pmic_update_power, > .get_raw_temp = intel_bxtwc_pmic_get_raw_temp, > diff --git a/drivers/acpi/pmic/intel_pmic_bytcrc.c b/drivers/acpi/pmic/intel_pmic_bytcrc.c > index 2a692cc4b7ae..8a1d895ed689 100644 > --- a/drivers/acpi/pmic/intel_pmic_bytcrc.c > +++ b/drivers/acpi/pmic/intel_pmic_bytcrc.c > @@ -271,7 +271,7 @@ static int intel_crc_pmic_update_policy(struct regmap *regmap, > return 0; > } > > -static struct intel_pmic_opregion_data intel_crc_pmic_opregion_data = { > +static const struct intel_pmic_opregion_data intel_crc_pmic_opregion_data = { > .get_power = intel_crc_pmic_get_power, > .update_power = intel_crc_pmic_update_power, > .get_raw_temp = intel_crc_pmic_get_raw_temp, > diff --git a/drivers/acpi/pmic/intel_pmic_chtcrc.c b/drivers/acpi/pmic/intel_pmic_chtcrc.c > index 2900dc3074d2..d8266d22cd8e 100644 > --- a/drivers/acpi/pmic/intel_pmic_chtcrc.c > +++ b/drivers/acpi/pmic/intel_pmic_chtcrc.c > @@ -23,7 +23,7 @@ > * intel_soc_pmic_exec_mipi_pmic_seq_element work on devices with a > * CHT Crystal Cove PMIC. > */ > -static struct intel_pmic_opregion_data intel_chtcrc_pmic_opregion_data = { > +static const struct intel_pmic_opregion_data intel_chtcrc_pmic_opregion_data = { > .pmic_i2c_address = 0x6e, > }; > > diff --git a/drivers/acpi/pmic/intel_pmic_chtdc_ti.c b/drivers/acpi/pmic/intel_pmic_chtdc_ti.c > index fef7831d0d63..cb444ddec5a0 100644 > --- a/drivers/acpi/pmic/intel_pmic_chtdc_ti.c > +++ b/drivers/acpi/pmic/intel_pmic_chtdc_ti.c > @@ -94,7 +94,7 @@ static int chtdc_ti_pmic_get_raw_temp(struct regmap *regmap, int reg) > return ((buf[0] & 0x03) << 8) | buf[1]; > } > > -static struct intel_pmic_opregion_data chtdc_ti_pmic_opregion_data = { > +static const struct intel_pmic_opregion_data chtdc_ti_pmic_opregion_data = { > .get_power = chtdc_ti_pmic_get_power, > .update_power = chtdc_ti_pmic_update_power, > .get_raw_temp = chtdc_ti_pmic_get_raw_temp, > diff --git a/drivers/acpi/pmic/intel_pmic_chtwc.c b/drivers/acpi/pmic/intel_pmic_chtwc.c > index 7ffd5624b8e1..59385a9a05e5 100644 > --- a/drivers/acpi/pmic/intel_pmic_chtwc.c > +++ b/drivers/acpi/pmic/intel_pmic_chtwc.c > @@ -253,7 +253,7 @@ static int intel_cht_wc_exec_mipi_pmic_seq_element(struct regmap *regmap, > * The thermal table and ops are empty, we do not support the Thermal opregion > * (DPTF) due to lacking documentation. > */ > -static struct intel_pmic_opregion_data intel_cht_wc_pmic_opregion_data = { > +static const struct intel_pmic_opregion_data intel_cht_wc_pmic_opregion_data = { > .get_power = intel_cht_wc_pmic_get_power, > .update_power = intel_cht_wc_pmic_update_power, > .exec_mipi_pmic_seq_element = intel_cht_wc_exec_mipi_pmic_seq_element, > diff --git a/drivers/acpi/pmic/intel_pmic_xpower.c b/drivers/acpi/pmic/intel_pmic_xpower.c > index cbe08e600fa3..b5f4d81c621f 100644 > --- a/drivers/acpi/pmic/intel_pmic_xpower.c > +++ b/drivers/acpi/pmic/intel_pmic_xpower.c > @@ -293,7 +293,7 @@ static int intel_xpower_exec_mipi_pmic_seq_element(struct regmap *regmap, > return ret; > } > > -static struct intel_pmic_opregion_data intel_xpower_pmic_opregion_data = { > +static const struct intel_pmic_opregion_data intel_xpower_pmic_opregion_data = { > .get_power = intel_xpower_pmic_get_power, > .update_power = intel_xpower_pmic_update_power, > .get_raw_temp = intel_xpower_pmic_get_raw_temp, > -- > 2.33.1 >
On Fri, Nov 26, 2021 at 4:50 PM Andy Shevchenko <andriy.shevchenko@intel.com> wrote: > > On Fri, Nov 26, 2021 at 04:21:07PM +0100, Hans de Goede wrote: > > The struct intel_pmic_opregion_data declarations never change, > > constify them all. > > Makes sense! > Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com> Applied as 5.17 material along with the [2-3/3], thanks!
diff --git a/drivers/acpi/pmic/intel_pmic.c b/drivers/acpi/pmic/intel_pmic.c index 9cde299eba88..98bbfd99c709 100644 --- a/drivers/acpi/pmic/intel_pmic.c +++ b/drivers/acpi/pmic/intel_pmic.c @@ -25,7 +25,7 @@ struct intel_pmic_opregion { struct mutex lock; struct acpi_lpat_conversion_table *lpat_table; struct regmap *regmap; - struct intel_pmic_opregion_data *data; + const struct intel_pmic_opregion_data *data; struct intel_pmic_regs_handler_ctx ctx; }; @@ -53,7 +53,7 @@ static acpi_status intel_pmic_power_handler(u32 function, { struct intel_pmic_opregion *opregion = region_context; struct regmap *regmap = opregion->regmap; - struct intel_pmic_opregion_data *d = opregion->data; + const struct intel_pmic_opregion_data *d = opregion->data; int reg, bit, result; if (bits != 32 || !value64) @@ -135,7 +135,7 @@ static int pmic_thermal_aux(struct intel_pmic_opregion *opregion, int reg, static int pmic_thermal_pen(struct intel_pmic_opregion *opregion, int reg, int bit, u32 function, u64 *value) { - struct intel_pmic_opregion_data *d = opregion->data; + const struct intel_pmic_opregion_data *d = opregion->data; struct regmap *regmap = opregion->regmap; if (!d->get_policy || !d->update_policy) @@ -171,7 +171,7 @@ static acpi_status intel_pmic_thermal_handler(u32 function, void *handler_context, void *region_context) { struct intel_pmic_opregion *opregion = region_context; - struct intel_pmic_opregion_data *d = opregion->data; + const struct intel_pmic_opregion_data *d = opregion->data; int reg, bit, result; if (bits != 32 || !value64) @@ -255,7 +255,7 @@ static acpi_status intel_pmic_regs_handler(u32 function, int intel_pmic_install_opregion_handler(struct device *dev, acpi_handle handle, struct regmap *regmap, - struct intel_pmic_opregion_data *d) + const struct intel_pmic_opregion_data *d) { acpi_status status = AE_OK; struct intel_pmic_opregion *opregion; @@ -344,7 +344,7 @@ EXPORT_SYMBOL_GPL(intel_pmic_install_opregion_handler); int intel_soc_pmic_exec_mipi_pmic_seq_element(u16 i2c_address, u32 reg_address, u32 value, u32 mask) { - struct intel_pmic_opregion_data *d; + const struct intel_pmic_opregion_data *d; int ret; if (!intel_pmic_opregion) { diff --git a/drivers/acpi/pmic/intel_pmic.h b/drivers/acpi/pmic/intel_pmic.h index 89379476a1df..467a39966dc8 100644 --- a/drivers/acpi/pmic/intel_pmic.h +++ b/drivers/acpi/pmic/intel_pmic.h @@ -25,6 +25,8 @@ struct intel_pmic_opregion_data { int pmic_i2c_address; }; -int intel_pmic_install_opregion_handler(struct device *dev, acpi_handle handle, struct regmap *regmap, struct intel_pmic_opregion_data *d); +int intel_pmic_install_opregion_handler(struct device *dev, acpi_handle handle, + struct regmap *regmap, + const struct intel_pmic_opregion_data *d); #endif diff --git a/drivers/acpi/pmic/intel_pmic_bxtwc.c b/drivers/acpi/pmic/intel_pmic_bxtwc.c index bd7621edd60b..6620ce0833f6 100644 --- a/drivers/acpi/pmic/intel_pmic_bxtwc.c +++ b/drivers/acpi/pmic/intel_pmic_bxtwc.c @@ -369,7 +369,7 @@ intel_bxtwc_pmic_update_policy(struct regmap *regmap, return regmap_update_bits(regmap, reg, mask, val); } -static struct intel_pmic_opregion_data intel_bxtwc_pmic_opregion_data = { +static const struct intel_pmic_opregion_data intel_bxtwc_pmic_opregion_data = { .get_power = intel_bxtwc_pmic_get_power, .update_power = intel_bxtwc_pmic_update_power, .get_raw_temp = intel_bxtwc_pmic_get_raw_temp, diff --git a/drivers/acpi/pmic/intel_pmic_bytcrc.c b/drivers/acpi/pmic/intel_pmic_bytcrc.c index 2a692cc4b7ae..8a1d895ed689 100644 --- a/drivers/acpi/pmic/intel_pmic_bytcrc.c +++ b/drivers/acpi/pmic/intel_pmic_bytcrc.c @@ -271,7 +271,7 @@ static int intel_crc_pmic_update_policy(struct regmap *regmap, return 0; } -static struct intel_pmic_opregion_data intel_crc_pmic_opregion_data = { +static const struct intel_pmic_opregion_data intel_crc_pmic_opregion_data = { .get_power = intel_crc_pmic_get_power, .update_power = intel_crc_pmic_update_power, .get_raw_temp = intel_crc_pmic_get_raw_temp, diff --git a/drivers/acpi/pmic/intel_pmic_chtcrc.c b/drivers/acpi/pmic/intel_pmic_chtcrc.c index 2900dc3074d2..d8266d22cd8e 100644 --- a/drivers/acpi/pmic/intel_pmic_chtcrc.c +++ b/drivers/acpi/pmic/intel_pmic_chtcrc.c @@ -23,7 +23,7 @@ * intel_soc_pmic_exec_mipi_pmic_seq_element work on devices with a * CHT Crystal Cove PMIC. */ -static struct intel_pmic_opregion_data intel_chtcrc_pmic_opregion_data = { +static const struct intel_pmic_opregion_data intel_chtcrc_pmic_opregion_data = { .pmic_i2c_address = 0x6e, }; diff --git a/drivers/acpi/pmic/intel_pmic_chtdc_ti.c b/drivers/acpi/pmic/intel_pmic_chtdc_ti.c index fef7831d0d63..cb444ddec5a0 100644 --- a/drivers/acpi/pmic/intel_pmic_chtdc_ti.c +++ b/drivers/acpi/pmic/intel_pmic_chtdc_ti.c @@ -94,7 +94,7 @@ static int chtdc_ti_pmic_get_raw_temp(struct regmap *regmap, int reg) return ((buf[0] & 0x03) << 8) | buf[1]; } -static struct intel_pmic_opregion_data chtdc_ti_pmic_opregion_data = { +static const struct intel_pmic_opregion_data chtdc_ti_pmic_opregion_data = { .get_power = chtdc_ti_pmic_get_power, .update_power = chtdc_ti_pmic_update_power, .get_raw_temp = chtdc_ti_pmic_get_raw_temp, diff --git a/drivers/acpi/pmic/intel_pmic_chtwc.c b/drivers/acpi/pmic/intel_pmic_chtwc.c index 7ffd5624b8e1..59385a9a05e5 100644 --- a/drivers/acpi/pmic/intel_pmic_chtwc.c +++ b/drivers/acpi/pmic/intel_pmic_chtwc.c @@ -253,7 +253,7 @@ static int intel_cht_wc_exec_mipi_pmic_seq_element(struct regmap *regmap, * The thermal table and ops are empty, we do not support the Thermal opregion * (DPTF) due to lacking documentation. */ -static struct intel_pmic_opregion_data intel_cht_wc_pmic_opregion_data = { +static const struct intel_pmic_opregion_data intel_cht_wc_pmic_opregion_data = { .get_power = intel_cht_wc_pmic_get_power, .update_power = intel_cht_wc_pmic_update_power, .exec_mipi_pmic_seq_element = intel_cht_wc_exec_mipi_pmic_seq_element, diff --git a/drivers/acpi/pmic/intel_pmic_xpower.c b/drivers/acpi/pmic/intel_pmic_xpower.c index cbe08e600fa3..b5f4d81c621f 100644 --- a/drivers/acpi/pmic/intel_pmic_xpower.c +++ b/drivers/acpi/pmic/intel_pmic_xpower.c @@ -293,7 +293,7 @@ static int intel_xpower_exec_mipi_pmic_seq_element(struct regmap *regmap, return ret; } -static struct intel_pmic_opregion_data intel_xpower_pmic_opregion_data = { +static const struct intel_pmic_opregion_data intel_xpower_pmic_opregion_data = { .get_power = intel_xpower_pmic_get_power, .update_power = intel_xpower_pmic_update_power, .get_raw_temp = intel_xpower_pmic_get_raw_temp,
The struct intel_pmic_opregion_data declarations never change, constify them all. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/acpi/pmic/intel_pmic.c | 12 ++++++------ drivers/acpi/pmic/intel_pmic.h | 4 +++- drivers/acpi/pmic/intel_pmic_bxtwc.c | 2 +- drivers/acpi/pmic/intel_pmic_bytcrc.c | 2 +- drivers/acpi/pmic/intel_pmic_chtcrc.c | 2 +- drivers/acpi/pmic/intel_pmic_chtdc_ti.c | 2 +- drivers/acpi/pmic/intel_pmic_chtwc.c | 2 +- drivers/acpi/pmic/intel_pmic_xpower.c | 2 +- 8 files changed, 15 insertions(+), 13 deletions(-)