Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e47a3cf7 authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Lee Jones
Browse files

mfd: axp20x: Remove second struct device * parameter for axp20x_match_device() 



The first argument passed to axp20x_match_device(), struct axp20x_dev *,
already contains a pointer to the device. By rearranging some code,
moving the assignment of the pointer before axp20x_match_device() is
called, we can eliminate the second parameter.

Suggested-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 6f89fa9e

drivers/mfd/axp20x.c

+6 −5
Original line number Diff line number Diff line
@@ -606,8 +606,9 @@ static void axp20x_power_off(void) 
		     AXP20X_OFF);

}



static int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)

static int axp20x_match_device(struct axp20x_dev *axp20x)

{

	struct device *dev = axp20x->dev;

	const struct acpi_device_id *acpi_id;

	const struct of_device_id *of_id;
@@ -673,14 +674,14 @@ static int axp20x_i2c_probe(struct i2c_client *i2c, 
	if (!axp20x)

		return -ENOMEM;



	ret = axp20x_match_device(axp20x, &i2c->dev);

	if (ret)

		return ret;



	axp20x->i2c_client = i2c;

	axp20x->dev = &i2c->dev;

	dev_set_drvdata(axp20x->dev, axp20x);



	ret = axp20x_match_device(axp20x);

	if (ret)

		return ret;



	axp20x->regmap = devm_regmap_init_i2c(i2c, axp20x->regmap_cfg);

	if (IS_ERR(axp20x->regmap)) {

		ret = PTR_ERR(axp20x->regmap);