mfd: mc13xxx: Use devm_* APIs
PATCH 1/1 mfd: mc13xxx: Use devm_* APIs
Signed-off-by Axel Lin <[email protected]>
--- drivers/mfd/mc13xxx-core.c | 4 ---- drivers/mfd/mc13xxx-i2c.c | 6 +++--- drivers/mfd/mc13xxx-spi.c | 5 ++--- 3 files changed, 5 insertions(+), 10 deletions(-)
drivers/mfd/mc13xxx-core.c +0 -4
@@ -723,10 +723,6 @@ void mc13xxx_common_cleanup(struct mc13xxx *mc13xxx)free_irq (mc13xxx->irq, mc13xxx);mfd_remove_devices (mc13xxx->dev); - -regmap_exit (mc13xxx->regmap); - -kfree (mc13xxx); }EXPORT_SYMBOL_GPL (mc13xxx_common_cleanup);
drivers/mfd/mc13xxx-i2c.c +3 -3
@@ -63,7 +63,7 @@ static int mc13xxx_i2c_probe(struct i2c_client *client,if (of_id) idrv->id_table = (const struct i2c_device_id *) of_id->data; - mc13xxx =kzalloc (sizeof (*mc13xxx),GFP_KERNEL ); + mc13xxx =devm_kzalloc (&client->dev,sizeof (*mc13xxx),GFP_KERNEL );if (!mc13xxx)return -ENOMEM ;
@@ -72,13 +72,13 @@ static int mc13xxx_i2c_probe(struct i2c_client *client, mc13xxx->dev = &client->dev;mutex_init (&mc13xxx->lock); - mc13xxx->regmap =regmap_init_i2c (client, &mc13xxx_regmap_i2c_config); + mc13xxx->regmap =devm_regmap_init_i2c (client, + &mc13xxx_regmap_i2c_config);if (IS_ERR (mc13xxx->regmap)) { ret =PTR_ERR (mc13xxx->regmap);dev_err (mc13xxx->dev,"Failed to initialize register map: %d\n" , ret);dev_set_drvdata (&client->dev,NULL ); -kfree (mc13xxx);return ret; }
drivers/mfd/mc13xxx-spi.c +2 -3
@@ -67,7 +67,7 @@ static int mc13xxx_spi_probe(struct spi_device *spi)if (of_id) sdrv->id_table = &mc13xxx_device_id[(enum mc13xxx_id ) of_id->data]; - mc13xxx =kzalloc (sizeof (*mc13xxx),GFP_KERNEL ); + mc13xxx =devm_kzalloc (&spi->dev,sizeof (*mc13xxx),GFP_KERNEL );if (!mc13xxx)return -ENOMEM ;
@@ -78,13 +78,12 @@ static int mc13xxx_spi_probe(struct spi_device *spi) mc13xxx->dev = &spi->dev;mutex_init (&mc13xxx->lock); - mc13xxx->regmap =regmap_init_spi (spi, &mc13xxx_regmap_spi_config); + mc13xxx->regmap =devm_regmap_init_spi (spi, &mc13xxx_regmap_spi_config);if (IS_ERR (mc13xxx->regmap)) { ret =PTR_ERR (mc13xxx->regmap);dev_err (mc13xxx->dev,"Failed to initialize register map: %d\n" , ret);dev_set_drvdata (&spi->dev,NULL ); -kfree (mc13xxx);return ret; }
Signature · 1 line
1.7.5.4
Hi Axel,
Quoted 6 lines · Axel Lin
Signed-off-by Axel Lin <[email protected]>--- drivers/mfd/mc13xxx-core.c | 4 ---- drivers/mfd/mc13xxx-i2c.c | 6 +++--- drivers/mfd/mc13xxx-spi.c | 5 ++--- 3 files changed, 5 insertions(+), 10 deletions(-)
Patch applied, thanks.
Cheers,
Samuel.
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/