Commit 17d49b7e authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Sebastian Reichel

power: supply: bq24190_charger: Fix "initializer element is not constant" error

When building with a version of GCC prior to 8.x, there is an error
around non-constant initializer elements:

  drivers/power/supply/bq24190_charger.c:1978:16: error: initializer element is not constant
     .vbus_desc = bq24190_vbus_desc,
                  ^~~~~~~~~~~~~~~~~
  drivers/power/supply/bq24190_charger.c:1978:16: note: (near initialization for 'bq24190_chip_info_tbl[0].vbus_desc')
  drivers/power/supply/bq24190_charger.c:1989:16: error: initializer element is not constant
     .vbus_desc = bq24190_vbus_desc,
                  ^~~~~~~~~~~~~~~~~
  drivers/power/supply/bq24190_charger.c:1989:16: note: (near initialization for 'bq24190_chip_info_tbl[1].vbus_desc')
  drivers/power/supply/bq24190_charger.c:2000:16: error: initializer element is not constant
     .vbus_desc = bq24190_vbus_desc,
                  ^~~~~~~~~~~~~~~~~
  drivers/power/supply/bq24190_charger.c:2000:16: note: (near initialization for 'bq24190_chip_info_tbl[2].vbus_desc')
  drivers/power/supply/bq24190_charger.c:2011:16: error: initializer element is not constant
     .vbus_desc = bq24190_vbus_desc,
                  ^~~~~~~~~~~~~~~~~
  drivers/power/supply/bq24190_charger.c:2011:16: note: (near initialization for 'bq24190_chip_info_tbl[3].vbus_desc')
  drivers/power/supply/bq24190_charger.c:2022:16: error: initializer element is not constant
     .vbus_desc = bq24296_vbus_desc,
                  ^~~~~~~~~~~~~~~~~
  drivers/power/supply/bq24190_charger.c:2022:16: note: (near initialization for 'bq24190_chip_info_tbl[4].vbus_desc')

Clang versions prior to 17.x show a similar error:

  drivers/power/supply/bq24190_charger.c:1978:16: error: initializer element is not a compile-time constant
                  .vbus_desc = bq24190_vbus_desc,
                               ^~~~~~~~~~~~~~~~~
  1 error generated.

Newer compilers have decided to accept these structures as compile time
constants as an extension. To resolve this issue for all supported
compilers, change the vbus_desc member in 'struct bq24190_chip_info' to
a pointer, as it is only ever passed by reference anyways, and adjust
the assignments accordingly.

Closes: https://github.com/ClangBuiltLinux/linux/issues/1973
Fixes: b150a703 ("power: supply: bq24190_charger: Add support for BQ24296")
Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
Reviewed-by: default avatarJustin Stitt <justinstitt@google.com>
Link: https://lore.kernel.org/r/20240103-fix-bq24190_charger-vbus_desc-non-const-v1-1-115ddf798c70@kernel.orgSigned-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 05599b5f
...@@ -246,7 +246,7 @@ struct bq24190_dev_info { ...@@ -246,7 +246,7 @@ struct bq24190_dev_info {
struct bq24190_chip_info { struct bq24190_chip_info {
int ichg_array_size; int ichg_array_size;
#ifdef CONFIG_REGULATOR #ifdef CONFIG_REGULATOR
const struct regulator_desc vbus_desc; const struct regulator_desc *vbus_desc;
#endif #endif
int (*check_chip)(struct bq24190_dev_info *bdi); int (*check_chip)(struct bq24190_dev_info *bdi);
int (*set_chg_config)(struct bq24190_dev_info *bdi, const u8 chg_config); int (*set_chg_config)(struct bq24190_dev_info *bdi, const u8 chg_config);
...@@ -728,7 +728,7 @@ static int bq24190_register_vbus_regulator(struct bq24190_dev_info *bdi) ...@@ -728,7 +728,7 @@ static int bq24190_register_vbus_regulator(struct bq24190_dev_info *bdi)
else else
cfg.init_data = &bq24190_vbus_init_data; cfg.init_data = &bq24190_vbus_init_data;
cfg.driver_data = bdi; cfg.driver_data = bdi;
reg = devm_regulator_register(bdi->dev, &bdi->info->vbus_desc, &cfg); reg = devm_regulator_register(bdi->dev, bdi->info->vbus_desc, &cfg);
if (IS_ERR(reg)) { if (IS_ERR(reg)) {
ret = PTR_ERR(reg); ret = PTR_ERR(reg);
dev_err(bdi->dev, "Can't register regulator: %d\n", ret); dev_err(bdi->dev, "Can't register regulator: %d\n", ret);
...@@ -1975,7 +1975,7 @@ static const struct bq24190_chip_info bq24190_chip_info_tbl[] = { ...@@ -1975,7 +1975,7 @@ static const struct bq24190_chip_info bq24190_chip_info_tbl[] = {
[BQ24190] = { [BQ24190] = {
.ichg_array_size = ARRAY_SIZE(bq24190_ccc_ichg_values), .ichg_array_size = ARRAY_SIZE(bq24190_ccc_ichg_values),
#ifdef CONFIG_REGULATOR #ifdef CONFIG_REGULATOR
.vbus_desc = bq24190_vbus_desc, .vbus_desc = &bq24190_vbus_desc,
#endif #endif
.check_chip = bq24190_check_chip, .check_chip = bq24190_check_chip,
.set_chg_config = bq24190_battery_set_chg_config, .set_chg_config = bq24190_battery_set_chg_config,
...@@ -1986,7 +1986,7 @@ static const struct bq24190_chip_info bq24190_chip_info_tbl[] = { ...@@ -1986,7 +1986,7 @@ static const struct bq24190_chip_info bq24190_chip_info_tbl[] = {
[BQ24192] = { [BQ24192] = {
.ichg_array_size = ARRAY_SIZE(bq24190_ccc_ichg_values), .ichg_array_size = ARRAY_SIZE(bq24190_ccc_ichg_values),
#ifdef CONFIG_REGULATOR #ifdef CONFIG_REGULATOR
.vbus_desc = bq24190_vbus_desc, .vbus_desc = &bq24190_vbus_desc,
#endif #endif
.check_chip = bq24190_check_chip, .check_chip = bq24190_check_chip,
.set_chg_config = bq24190_battery_set_chg_config, .set_chg_config = bq24190_battery_set_chg_config,
...@@ -1997,7 +1997,7 @@ static const struct bq24190_chip_info bq24190_chip_info_tbl[] = { ...@@ -1997,7 +1997,7 @@ static const struct bq24190_chip_info bq24190_chip_info_tbl[] = {
[BQ24192i] = { [BQ24192i] = {
.ichg_array_size = ARRAY_SIZE(bq24190_ccc_ichg_values), .ichg_array_size = ARRAY_SIZE(bq24190_ccc_ichg_values),
#ifdef CONFIG_REGULATOR #ifdef CONFIG_REGULATOR
.vbus_desc = bq24190_vbus_desc, .vbus_desc = &bq24190_vbus_desc,
#endif #endif
.check_chip = bq24190_check_chip, .check_chip = bq24190_check_chip,
.set_chg_config = bq24190_battery_set_chg_config, .set_chg_config = bq24190_battery_set_chg_config,
...@@ -2008,7 +2008,7 @@ static const struct bq24190_chip_info bq24190_chip_info_tbl[] = { ...@@ -2008,7 +2008,7 @@ static const struct bq24190_chip_info bq24190_chip_info_tbl[] = {
[BQ24196] = { [BQ24196] = {
.ichg_array_size = ARRAY_SIZE(bq24190_ccc_ichg_values), .ichg_array_size = ARRAY_SIZE(bq24190_ccc_ichg_values),
#ifdef CONFIG_REGULATOR #ifdef CONFIG_REGULATOR
.vbus_desc = bq24190_vbus_desc, .vbus_desc = &bq24190_vbus_desc,
#endif #endif
.check_chip = bq24190_check_chip, .check_chip = bq24190_check_chip,
.set_chg_config = bq24190_battery_set_chg_config, .set_chg_config = bq24190_battery_set_chg_config,
...@@ -2019,7 +2019,7 @@ static const struct bq24190_chip_info bq24190_chip_info_tbl[] = { ...@@ -2019,7 +2019,7 @@ static const struct bq24190_chip_info bq24190_chip_info_tbl[] = {
[BQ24296] = { [BQ24296] = {
.ichg_array_size = BQ24296_CCC_ICHG_VALUES_LEN, .ichg_array_size = BQ24296_CCC_ICHG_VALUES_LEN,
#ifdef CONFIG_REGULATOR #ifdef CONFIG_REGULATOR
.vbus_desc = bq24296_vbus_desc, .vbus_desc = &bq24296_vbus_desc,
#endif #endif
.check_chip = bq24296_check_chip, .check_chip = bq24296_check_chip,
.set_chg_config = bq24296_battery_set_chg_config, .set_chg_config = bq24296_battery_set_chg_config,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment