Unverified Commit fceffbfe authored by Patrick Rudolph's avatar Patrick Rudolph Committed by Mark Brown
Browse files

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: default avatarPatrick Rudolph <patrick.rudolph@9elements.com>
Acked-by: default avatarLee Jones <lee@kernel.org>
Link: https://patch.msgid.link/20241002125500.78278-1-patrick.rudolph@9elements.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4e9a2c91

drivers/regulator/max5970-regulator.c

+4 −17
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ static int max597x_irq_handler(int irq, struct regulator_irq_data *rid, 
}



static int max597x_adc_range(struct regmap *regmap, const int ch,

			     u32 *irng, u32 *mon_rng)

			     int *irng, int *mon_rng)

{

	unsigned int reg;

	int ret;
@@ -552,7 +552,6 @@ static int max597x_setup_irq(struct device *dev, 


static int max597x_regulator_probe(struct platform_device *pdev)

{

	struct max5970_data *max597x;

	struct regmap *regmap = dev_get_regmap(pdev->dev.parent, NULL);

	struct max5970_regulator *data;

	struct i2c_client *i2c = to_i2c_client(pdev->dev.parent);
@@ -566,26 +565,18 @@ static int max597x_regulator_probe(struct platform_device *pdev) 
	if (!regmap)

		return -EPROBE_DEFER;



	max597x = devm_kzalloc(&i2c->dev, sizeof(struct max5970_data), GFP_KERNEL);

	if (!max597x)

		return -ENOMEM;



	rdevs = devm_kcalloc(&i2c->dev, MAX5970_NUM_SWITCHES, sizeof(struct regulator_dev *),

			     GFP_KERNEL);

	if (!rdevs)

		return -ENOMEM;



	i2c_set_clientdata(i2c, max597x);



	if (of_device_is_compatible(i2c->dev.of_node, "maxim,max5978"))

		max597x->num_switches = MAX5978_NUM_SWITCHES;

		num_switches = MAX5978_NUM_SWITCHES;

	else if (of_device_is_compatible(i2c->dev.of_node, "maxim,max5970"))

		max597x->num_switches = MAX5970_NUM_SWITCHES;

		num_switches = MAX5970_NUM_SWITCHES;

	else

		return -ENODEV;



	num_switches = max597x->num_switches;



	for (i = 0; i < num_switches; i++) {

		data =

		    devm_kzalloc(&i2c->dev, sizeof(struct max5970_regulator),
@@ -596,13 +587,10 @@ static int max597x_regulator_probe(struct platform_device *pdev) 
		data->num_switches = num_switches;

		data->regmap = regmap;



		ret = max597x_adc_range(regmap, i, &max597x->irng[i], &max597x->mon_rng[i]);

		ret = max597x_adc_range(regmap, i, &data->irng, &data->mon_rng);

		if (ret < 0)

			return ret;



		data->irng = max597x->irng[i];

		data->mon_rng = max597x->mon_rng[i];



		config.dev = &i2c->dev;

		config.driver_data = (void *)data;

		config.regmap = data->regmap;
@@ -614,7 +602,6 @@ static int max597x_regulator_probe(struct platform_device *pdev) 
			return PTR_ERR(rdev);

		}

		rdevs[i] = rdev;

		max597x->shunt_micro_ohms[i] = data->shunt_micro_ohms;

	}



	if (IS_REACHABLE(CONFIG_HWMON)) {

include/linux/mfd/max5970.h

+0 −12
Original line number Diff line number Diff line
@@ -16,18 +16,6 @@ 
#define MAX5978_NUM_SWITCHES 1

#define MAX5970_NUM_LEDS     4



struct max5970_data {

	int num_switches;

	u32 irng[MAX5970_NUM_SWITCHES];

	u32 mon_rng[MAX5970_NUM_SWITCHES];

	u32 shunt_micro_ohms[MAX5970_NUM_SWITCHES];

};



enum max5970_chip_type {

	TYPE_MAX5978 = 1,

	TYPE_MAX5970,

};



#define MAX5970_REG_CURRENT_L(ch)		(0x01 + (ch) * 4)

#define MAX5970_REG_CURRENT_H(ch)		(0x00 + (ch) * 4)

#define MAX5970_REG_VOLTAGE_L(ch)		(0x03 + (ch) * 4)