From 621210e25d5de02dae111ad90548577dd64c7663 Mon Sep 17 00:00:00 2001 From: Sangbeom Kim <sbkim73@samsung.com> Date: Fri, 20 Jan 2012 16:09:11 +0900 Subject: [PATCH] mfd: Convert s5m core driver to use devm_kzalloc() Convert s5m core driver to use devm_kzalloc(). Signed-off-by: Sangbeom Kim <sbkim73@samsung.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> --- drivers/mfd/s5m-core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/s5m-core.c b/drivers/mfd/s5m-core.c index caadabeed8e9..75853988fe3e 100644 --- a/drivers/mfd/s5m-core.c +++ b/drivers/mfd/s5m-core.c @@ -77,7 +77,8 @@ static int s5m87xx_i2c_probe(struct i2c_client *i2c, int ret = 0; int error; - s5m87xx = kzalloc(sizeof(struct s5m87xx_dev), GFP_KERNEL); + s5m87xx = devm_kzalloc(&i2c->dev, sizeof(struct s5m87xx_dev), + GFP_KERNEL); if (s5m87xx == NULL) return -ENOMEM; @@ -126,7 +127,6 @@ err: s5m_irq_exit(s5m87xx); i2c_unregister_device(s5m87xx->rtc); regmap_exit(s5m87xx->regmap); - kfree(s5m87xx); return ret; } @@ -138,7 +138,6 @@ static int s5m87xx_i2c_remove(struct i2c_client *i2c) s5m_irq_exit(s5m87xx); i2c_unregister_device(s5m87xx->rtc); regmap_exit(s5m87xx->regmap); - kfree(s5m87xx); return 0; } -- 2.34.1