Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

regulator: max5970: Drop unused structs

After splitting the max5970 into a MFD device clean the remaining
code and drop unused structs.

The struct max5970_data and enum max5970_chip_type aren't used.

Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Acked-by: Lee Jones <lee@kernel.org>
Link: https://patch.msgid.link/20241002125500.78278-1-patrick.rudolph@9elements.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Patrick Rudolph and committed by
Mark Brown
fceffbfe 4e9a2c91

+4 -29
+4 -17
drivers/regulator/max5970-regulator.c
··· 485 485 } 486 486 487 487 static int max597x_adc_range(struct regmap *regmap, const int ch, 488 - u32 *irng, u32 *mon_rng) 488 + int *irng, int *mon_rng) 489 489 { 490 490 unsigned int reg; 491 491 int ret; ··· 552 552 553 553 static int max597x_regulator_probe(struct platform_device *pdev) 554 554 { 555 - struct max5970_data *max597x; 556 555 struct regmap *regmap = dev_get_regmap(pdev->dev.parent, NULL); 557 556 struct max5970_regulator *data; 558 557 struct i2c_client *i2c = to_i2c_client(pdev->dev.parent); ··· 565 566 if (!regmap) 566 567 return -EPROBE_DEFER; 567 568 568 - max597x = devm_kzalloc(&i2c->dev, sizeof(struct max5970_data), GFP_KERNEL); 569 - if (!max597x) 570 - return -ENOMEM; 571 - 572 569 rdevs = devm_kcalloc(&i2c->dev, MAX5970_NUM_SWITCHES, sizeof(struct regulator_dev *), 573 570 GFP_KERNEL); 574 571 if (!rdevs) 575 572 return -ENOMEM; 576 573 577 - i2c_set_clientdata(i2c, max597x); 578 - 579 574 if (of_device_is_compatible(i2c->dev.of_node, "maxim,max5978")) 580 - max597x->num_switches = MAX5978_NUM_SWITCHES; 575 + num_switches = MAX5978_NUM_SWITCHES; 581 576 else if (of_device_is_compatible(i2c->dev.of_node, "maxim,max5970")) 582 - max597x->num_switches = MAX5970_NUM_SWITCHES; 577 + num_switches = MAX5970_NUM_SWITCHES; 583 578 else 584 579 return -ENODEV; 585 - 586 - num_switches = max597x->num_switches; 587 580 588 581 for (i = 0; i < num_switches; i++) { 589 582 data = ··· 587 596 data->num_switches = num_switches; 588 597 data->regmap = regmap; 589 598 590 - ret = max597x_adc_range(regmap, i, &max597x->irng[i], &max597x->mon_rng[i]); 599 + ret = max597x_adc_range(regmap, i, &data->irng, &data->mon_rng); 591 600 if (ret < 0) 592 601 return ret; 593 - 594 - data->irng = max597x->irng[i]; 595 - data->mon_rng = max597x->mon_rng[i]; 596 602 597 603 config.dev = &i2c->dev; 598 604 config.driver_data = (void *)data; ··· 602 614 return PTR_ERR(rdev); 603 615 } 604 616 rdevs[i] = rdev; 605 - max597x->shunt_micro_ohms[i] = data->shunt_micro_ohms; 606 617 } 607 618 608 619 if (IS_REACHABLE(CONFIG_HWMON)) {
-12
include/linux/mfd/max5970.h
··· 16 16 #define MAX5978_NUM_SWITCHES 1 17 17 #define MAX5970_NUM_LEDS 4 18 18 19 - struct max5970_data { 20 - int num_switches; 21 - u32 irng[MAX5970_NUM_SWITCHES]; 22 - u32 mon_rng[MAX5970_NUM_SWITCHES]; 23 - u32 shunt_micro_ohms[MAX5970_NUM_SWITCHES]; 24 - }; 25 - 26 - enum max5970_chip_type { 27 - TYPE_MAX5978 = 1, 28 - TYPE_MAX5970, 29 - }; 30 - 31 19 #define MAX5970_REG_CURRENT_L(ch) (0x01 + (ch) * 4) 32 20 #define MAX5970_REG_CURRENT_H(ch) (0x00 + (ch) * 4) 33 21 #define MAX5970_REG_VOLTAGE_L(ch) (0x03 + (ch) * 4)