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

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

mfd: Convert wm831x core driver to devm_kzalloc() 



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

drivers/mfd/wm831x-core.c

+0 −2
Original line number Diff line number Diff line
@@ -1875,7 +1875,6 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq) 
err_regmap:

	mfd_remove_devices(wm831x->dev);

	regmap_exit(wm831x->regmap);

	kfree(wm831x);

	return ret;

}
@@ -1887,7 +1886,6 @@ void wm831x_device_exit(struct wm831x *wm831x) 
		free_irq(wm831x->irq_base + WM831X_IRQ_AUXADC_DATA, wm831x);

	wm831x_irq_exit(wm831x);

	regmap_exit(wm831x->regmap);

	kfree(wm831x);

}



int wm831x_device_suspend(struct wm831x *wm831x)

drivers/mfd/wm831x-i2c.c

+1 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static int wm831x_i2c_probe(struct i2c_client *i2c, 
	struct wm831x *wm831x;

	int ret;



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

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

	if (wm831x == NULL)

		return -ENOMEM;
@@ -42,7 +42,6 @@ static int wm831x_i2c_probe(struct i2c_client *i2c, 
		ret = PTR_ERR(wm831x->regmap);

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

			ret);

		kfree(wm831x);

		return ret;

	}

drivers/mfd/wm831x-spi.c

+1 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static int __devinit wm831x_spi_probe(struct spi_device *spi) 


	type = (enum wm831x_parent)id->driver_data;



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

	wm831x = devm_kzalloc(&spi->dev, sizeof(struct wm831x), GFP_KERNEL);

	if (wm831x == NULL)

		return -ENOMEM;
@@ -45,7 +45,6 @@ static int __devinit wm831x_spi_probe(struct spi_device *spi) 
		ret = PTR_ERR(wm831x->regmap);

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

			ret);

		kfree(wm831x);

		return ret;

	}