leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mfd: Convert s5m core driver to use devm_kzalloc()

Browse Source 
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>
This commit is contained in:
Sangbeom Kim 2012-01-20 16:09:11 +09:00 committed by Samuel Ortiz
parent 1773140fec
commit 621210e25d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/mfd/s5m-core.c
View File

@ -77,7 +77,8 @@ static int s5m87xx_i2c_probe(struct i2c_client *i2c,
int ret = 0; int ret = 0;
int error; int error;
s5m87xx = kzalloc(sizeof(struct s5m87xx_dev), GFP_KERNEL); s5m87xx = devm_kzalloc(&i2c->dev, sizeof(struct s5m87xx_dev),
GFP_KERNEL);
if (s5m87xx == NULL) if (s5m87xx == NULL)
return -ENOMEM; return -ENOMEM;
@ -126,7 +127,6 @@ err:
s5m_irq_exit(s5m87xx); s5m_irq_exit(s5m87xx);
i2c_unregister_device(s5m87xx->rtc); i2c_unregister_device(s5m87xx->rtc);
regmap_exit(s5m87xx->regmap); regmap_exit(s5m87xx->regmap);
kfree(s5m87xx);
return ret; return ret;
} }
@ -138,7 +138,6 @@ static int s5m87xx_i2c_remove(struct i2c_client *i2c)
s5m_irq_exit(s5m87xx); s5m_irq_exit(s5m87xx);
i2c_unregister_device(s5m87xx->rtc); i2c_unregister_device(s5m87xx->rtc);
regmap_exit(s5m87xx->regmap); regmap_exit(s5m87xx->regmap);
kfree(s5m87xx);
return 0; return 0;
} }