Skip to content

Commit fceffbf

Browse files
PatrickRudolphbroonie
authored andcommitted
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>
1 parent 4e9a2c9 commit fceffbf

File tree

2 files changed

+4
-29
lines changed

2 files changed

+4
-29
lines changed

drivers/regulator/max5970-regulator.c

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ static int max597x_irq_handler(int irq, struct regulator_irq_data *rid,
485485
}
486486

487487
static int max597x_adc_range(struct regmap *regmap, const int ch,
488-
u32 *irng, u32 *mon_rng)
488+
int *irng, int *mon_rng)
489489
{
490490
unsigned int reg;
491491
int ret;
@@ -552,7 +552,6 @@ static int max597x_setup_irq(struct device *dev,
552552

553553
static int max597x_regulator_probe(struct platform_device *pdev)
554554
{
555-
struct max5970_data *max597x;
556555
struct regmap *regmap = dev_get_regmap(pdev->dev.parent, NULL);
557556
struct max5970_regulator *data;
558557
struct i2c_client *i2c = to_i2c_client(pdev->dev.parent);
@@ -566,26 +565,18 @@ static int max597x_regulator_probe(struct platform_device *pdev)
566565
if (!regmap)
567566
return -EPROBE_DEFER;
568567

569-
max597x = devm_kzalloc(&i2c->dev, sizeof(struct max5970_data), GFP_KERNEL);
570-
if (!max597x)
571-
return -ENOMEM;
572-
573568
rdevs = devm_kcalloc(&i2c->dev, MAX5970_NUM_SWITCHES, sizeof(struct regulator_dev *),
574569
GFP_KERNEL);
575570
if (!rdevs)
576571
return -ENOMEM;
577572

578-
i2c_set_clientdata(i2c, max597x);
579-
580573
if (of_device_is_compatible(i2c->dev.of_node, "maxim,max5978"))
581-
max597x->num_switches = MAX5978_NUM_SWITCHES;
574+
num_switches = MAX5978_NUM_SWITCHES;
582575
else if (of_device_is_compatible(i2c->dev.of_node, "maxim,max5970"))
583-
max597x->num_switches = MAX5970_NUM_SWITCHES;
576+
num_switches = MAX5970_NUM_SWITCHES;
584577
else
585578
return -ENODEV;
586579

587-
num_switches = max597x->num_switches;
588-
589580
for (i = 0; i < num_switches; i++) {
590581
data =
591582
devm_kzalloc(&i2c->dev, sizeof(struct max5970_regulator),
@@ -596,13 +587,10 @@ static int max597x_regulator_probe(struct platform_device *pdev)
596587
data->num_switches = num_switches;
597588
data->regmap = regmap;
598589

599-
ret = max597x_adc_range(regmap, i, &max597x->irng[i], &max597x->mon_rng[i]);
590+
ret = max597x_adc_range(regmap, i, &data->irng, &data->mon_rng);
600591
if (ret < 0)
601592
return ret;
602593

603-
data->irng = max597x->irng[i];
604-
data->mon_rng = max597x->mon_rng[i];
605-
606594
config.dev = &i2c->dev;
607595
config.driver_data = (void *)data;
608596
config.regmap = data->regmap;
@@ -614,7 +602,6 @@ static int max597x_regulator_probe(struct platform_device *pdev)
614602
return PTR_ERR(rdev);
615603
}
616604
rdevs[i] = rdev;
617-
max597x->shunt_micro_ohms[i] = data->shunt_micro_ohms;
618605
}
619606

620607
if (IS_REACHABLE(CONFIG_HWMON)) {

include/linux/mfd/max5970.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,6 @@
1616
#define MAX5978_NUM_SWITCHES 1
1717
#define MAX5970_NUM_LEDS 4
1818

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-
3119
#define MAX5970_REG_CURRENT_L(ch) (0x01 + (ch) * 4)
3220
#define MAX5970_REG_CURRENT_H(ch) (0x00 + (ch) * 4)
3321
#define MAX5970_REG_VOLTAGE_L(ch) (0x03 + (ch) * 4)

0 commit comments

Comments
 (0)