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

Commit 42ab84fb authored by Mark Brown's avatar Mark Brown Committed by Samuel Ortiz
Browse files

mfd: Convert wm8994 to devm_kzalloc() 



Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent d48cbb74

drivers/mfd/wm8994-core.c

+5 −11
Original line number Diff line number Diff line
@@ -402,9 +402,9 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq) 
		goto err_regmap;

	}



	wm8994->supplies = kzalloc(sizeof(struct regulator_bulk_data) *

				   wm8994->num_supplies,

				   GFP_KERNEL);

	wm8994->supplies = devm_kzalloc(wm8994->dev,

					sizeof(struct regulator_bulk_data) *

					wm8994->num_supplies, GFP_KERNEL);

	if (!wm8994->supplies) {

		ret = -ENOMEM;

		goto err_regmap;
@@ -432,7 +432,7 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq) 
				 wm8994->supplies);

	if (ret != 0) {

		dev_err(wm8994->dev, "Failed to get supplies: %d\n", ret);

		goto err_supplies;

		goto err_regmap;

	}



	ret = regulator_bulk_enable(wm8994->num_supplies,
@@ -560,12 +560,9 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq) 
			       wm8994->supplies);

err_get:

	regulator_bulk_free(wm8994->num_supplies, wm8994->supplies);

err_supplies:

	kfree(wm8994->supplies);

err_regmap:

	regmap_exit(wm8994->regmap);

	mfd_remove_devices(wm8994->dev);

	kfree(wm8994);

	return ret;

}
@@ -577,9 +574,7 @@ static void wm8994_device_exit(struct wm8994 *wm8994) 
	regulator_bulk_disable(wm8994->num_supplies,

			       wm8994->supplies);

	regulator_bulk_free(wm8994->num_supplies, wm8994->supplies);

	kfree(wm8994->supplies);

	regmap_exit(wm8994->regmap);

	kfree(wm8994);

}



static int wm8994_i2c_probe(struct i2c_client *i2c,
@@ -588,7 +583,7 @@ static int wm8994_i2c_probe(struct i2c_client *i2c, 
	struct wm8994 *wm8994;

	int ret;



	wm8994 = kzalloc(sizeof(struct wm8994), GFP_KERNEL);

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

	if (wm8994 == NULL)

		return -ENOMEM;
@@ -602,7 +597,6 @@ static int wm8994_i2c_probe(struct i2c_client *i2c, 
		ret = PTR_ERR(wm8994->regmap);

		dev_err(wm8994->dev, "Failed to allocate register map: %d\n",

			ret);

		kfree(wm8994);

		return ret;

	}