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

Commit 2614a859 authored by Maxime Ripard's avatar Maxime Ripard Committed by Jean Delvare
Browse files

i2c-mux-gpio: Use devm_kzalloc instead of kzalloc 



Use the devm_kzalloc managed function to stripdown the error and remove
code.

Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent 3ad7ea18

drivers/i2c/muxes/i2c-mux-gpio.c

+5 −9
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static int __devinit i2c_mux_gpio_probe(struct platform_device *pdev) 
		return -ENODEV;

	}



	mux = kzalloc(sizeof(*mux), GFP_KERNEL);

	mux = devm_kzalloc(&pdev->dev, sizeof(*mux), GFP_KERNEL);

	if (!mux) {

		ret = -ENOMEM;

		goto alloc_failed;
@@ -79,11 +79,12 @@ static int __devinit i2c_mux_gpio_probe(struct platform_device *pdev) 


	mux->parent = parent;

	mux->data = *pdata;

	mux->adap = kzalloc(sizeof(struct i2c_adapter *) * pdata->n_values,

	mux->adap = devm_kzalloc(&pdev->dev,

				 sizeof(*mux->adap) * pdata->n_values,

				 GFP_KERNEL);

	if (!mux->adap) {

		ret = -ENOMEM;

		goto alloc_failed2;

		goto alloc_failed;

	}



	if (pdata->idle != I2C_MUX_GPIO_NO_IDLE) {
@@ -130,9 +131,6 @@ add_adapter_failed: 
err_request_gpio:

	for (; i > 0; i--)

		gpio_free(pdata->gpios[i - 1]);

	kfree(mux->adap);

alloc_failed2:

	kfree(mux);

alloc_failed:

	i2c_put_adapter(parent);
@@ -152,8 +150,6 @@ static int __devexit i2c_mux_gpio_remove(struct platform_device *pdev) 


	platform_set_drvdata(pdev, NULL);

	i2c_put_adapter(mux->parent);

	kfree(mux->adap);

	kfree(mux);



	return 0;

}