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

Commit 9c998326 authored by Laxman Dewangan's avatar Laxman Dewangan Committed by Lee Jones
Browse files

mfd: as3711: Use devm_mfd_add_devices() for mfd_device registration 



Use devm_mfd_add_devices() for MFD devices registration and get
rid of .remove callback to remove MFD child-devices. This is done
by managed device framework.

CC: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent f9932c6e

drivers/mfd/as3711.c

+2 −11
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static int as3711_i2c_probe(struct i2c_client *client, 
		as3711_subdevs[AS3711_BACKLIGHT].pdata_size = 0;

	}



	ret = mfd_add_devices(as3711->dev, -1, as3711_subdevs,

	ret = devm_mfd_add_devices(as3711->dev, -1, as3711_subdevs,

				   ARRAY_SIZE(as3711_subdevs), NULL, 0, NULL);

	if (ret < 0)

		dev_err(&client->dev, "add mfd devices failed: %d\n", ret);
@@ -197,14 +197,6 @@ static int as3711_i2c_probe(struct i2c_client *client, 
	return ret;

}



static int as3711_i2c_remove(struct i2c_client *client)

{

	struct as3711 *as3711 = i2c_get_clientdata(client);



	mfd_remove_devices(as3711->dev);

	return 0;

}



static const struct i2c_device_id as3711_i2c_id[] = {

	{.name = "as3711", .driver_data = 0},

	{}
@@ -218,7 +210,6 @@ static struct i2c_driver as3711_i2c_driver = { 
		   .of_match_table = of_match_ptr(as3711_of_match),

	},

	.probe = as3711_i2c_probe,

	.remove = as3711_i2c_remove,

	.id_table = as3711_i2c_id,

};