Skip to content

Commit e172e65

Browse files
jwrdegoederafaeljw
authored andcommitted
ACPI: PMIC: constify all struct intel_pmic_opregion_data declarations
The struct intel_pmic_opregion_data declarations never change, constify them all. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 0fcfb00 commit e172e65

8 files changed

Lines changed: 15 additions & 13 deletions

File tree

drivers/acpi/pmic/intel_pmic.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ struct intel_pmic_opregion {
2525
struct mutex lock;
2626
struct acpi_lpat_conversion_table *lpat_table;
2727
struct regmap *regmap;
28-
struct intel_pmic_opregion_data *data;
28+
const struct intel_pmic_opregion_data *data;
2929
struct intel_pmic_regs_handler_ctx ctx;
3030
};
3131

@@ -53,7 +53,7 @@ static acpi_status intel_pmic_power_handler(u32 function,
5353
{
5454
struct intel_pmic_opregion *opregion = region_context;
5555
struct regmap *regmap = opregion->regmap;
56-
struct intel_pmic_opregion_data *d = opregion->data;
56+
const struct intel_pmic_opregion_data *d = opregion->data;
5757
int reg, bit, result;
5858

5959
if (bits != 32 || !value64)
@@ -135,7 +135,7 @@ static int pmic_thermal_aux(struct intel_pmic_opregion *opregion, int reg,
135135
static int pmic_thermal_pen(struct intel_pmic_opregion *opregion, int reg,
136136
int bit, u32 function, u64 *value)
137137
{
138-
struct intel_pmic_opregion_data *d = opregion->data;
138+
const struct intel_pmic_opregion_data *d = opregion->data;
139139
struct regmap *regmap = opregion->regmap;
140140

141141
if (!d->get_policy || !d->update_policy)
@@ -171,7 +171,7 @@ static acpi_status intel_pmic_thermal_handler(u32 function,
171171
void *handler_context, void *region_context)
172172
{
173173
struct intel_pmic_opregion *opregion = region_context;
174-
struct intel_pmic_opregion_data *d = opregion->data;
174+
const struct intel_pmic_opregion_data *d = opregion->data;
175175
int reg, bit, result;
176176

177177
if (bits != 32 || !value64)
@@ -255,7 +255,7 @@ static acpi_status intel_pmic_regs_handler(u32 function,
255255

256256
int intel_pmic_install_opregion_handler(struct device *dev, acpi_handle handle,
257257
struct regmap *regmap,
258-
struct intel_pmic_opregion_data *d)
258+
const struct intel_pmic_opregion_data *d)
259259
{
260260
acpi_status status = AE_OK;
261261
struct intel_pmic_opregion *opregion;
@@ -344,7 +344,7 @@ EXPORT_SYMBOL_GPL(intel_pmic_install_opregion_handler);
344344
int intel_soc_pmic_exec_mipi_pmic_seq_element(u16 i2c_address, u32 reg_address,
345345
u32 value, u32 mask)
346346
{
347-
struct intel_pmic_opregion_data *d;
347+
const struct intel_pmic_opregion_data *d;
348348
int ret;
349349

350350
if (!intel_pmic_opregion) {

drivers/acpi/pmic/intel_pmic.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ struct intel_pmic_opregion_data {
2525
int pmic_i2c_address;
2626
};
2727

28-
int intel_pmic_install_opregion_handler(struct device *dev, acpi_handle handle, struct regmap *regmap, struct intel_pmic_opregion_data *d);
28+
int intel_pmic_install_opregion_handler(struct device *dev, acpi_handle handle,
29+
struct regmap *regmap,
30+
const struct intel_pmic_opregion_data *d);
2931

3032
#endif

drivers/acpi/pmic/intel_pmic_bxtwc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ intel_bxtwc_pmic_update_policy(struct regmap *regmap,
369369
return regmap_update_bits(regmap, reg, mask, val);
370370
}
371371

372-
static struct intel_pmic_opregion_data intel_bxtwc_pmic_opregion_data = {
372+
static const struct intel_pmic_opregion_data intel_bxtwc_pmic_opregion_data = {
373373
.get_power = intel_bxtwc_pmic_get_power,
374374
.update_power = intel_bxtwc_pmic_update_power,
375375
.get_raw_temp = intel_bxtwc_pmic_get_raw_temp,

drivers/acpi/pmic/intel_pmic_bytcrc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ static int intel_crc_pmic_update_policy(struct regmap *regmap,
271271
return 0;
272272
}
273273

274-
static struct intel_pmic_opregion_data intel_crc_pmic_opregion_data = {
274+
static const struct intel_pmic_opregion_data intel_crc_pmic_opregion_data = {
275275
.get_power = intel_crc_pmic_get_power,
276276
.update_power = intel_crc_pmic_update_power,
277277
.get_raw_temp = intel_crc_pmic_get_raw_temp,

drivers/acpi/pmic/intel_pmic_chtcrc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* intel_soc_pmic_exec_mipi_pmic_seq_element work on devices with a
2424
* CHT Crystal Cove PMIC.
2525
*/
26-
static struct intel_pmic_opregion_data intel_chtcrc_pmic_opregion_data = {
26+
static const struct intel_pmic_opregion_data intel_chtcrc_pmic_opregion_data = {
2727
.pmic_i2c_address = 0x6e,
2828
};
2929

drivers/acpi/pmic/intel_pmic_chtdc_ti.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ static int chtdc_ti_pmic_get_raw_temp(struct regmap *regmap, int reg)
9494
return ((buf[0] & 0x03) << 8) | buf[1];
9595
}
9696

97-
static struct intel_pmic_opregion_data chtdc_ti_pmic_opregion_data = {
97+
static const struct intel_pmic_opregion_data chtdc_ti_pmic_opregion_data = {
9898
.get_power = chtdc_ti_pmic_get_power,
9999
.update_power = chtdc_ti_pmic_update_power,
100100
.get_raw_temp = chtdc_ti_pmic_get_raw_temp,

drivers/acpi/pmic/intel_pmic_chtwc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ static int intel_cht_wc_exec_mipi_pmic_seq_element(struct regmap *regmap,
253253
* The thermal table and ops are empty, we do not support the Thermal opregion
254254
* (DPTF) due to lacking documentation.
255255
*/
256-
static struct intel_pmic_opregion_data intel_cht_wc_pmic_opregion_data = {
256+
static const struct intel_pmic_opregion_data intel_cht_wc_pmic_opregion_data = {
257257
.get_power = intel_cht_wc_pmic_get_power,
258258
.update_power = intel_cht_wc_pmic_update_power,
259259
.exec_mipi_pmic_seq_element = intel_cht_wc_exec_mipi_pmic_seq_element,

drivers/acpi/pmic/intel_pmic_xpower.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ static int intel_xpower_exec_mipi_pmic_seq_element(struct regmap *regmap,
293293
return ret;
294294
}
295295

296-
static struct intel_pmic_opregion_data intel_xpower_pmic_opregion_data = {
296+
static const struct intel_pmic_opregion_data intel_xpower_pmic_opregion_data = {
297297
.get_power = intel_xpower_pmic_get_power,
298298
.update_power = intel_xpower_pmic_update_power,
299299
.get_raw_temp = intel_xpower_pmic_get_raw_temp,

0 commit comments

Comments
 (0)