Skip to content

Commit

Permalink
mfd: Convert s5m core driver to use devm_kzalloc()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sangbeom Kim authored and Samuel Ortiz committed Mar 6, 2012
1 parent 1773140 commit 621210e
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/mfd/s5m-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -126,7 +127,6 @@ static int s5m87xx_i2c_probe(struct i2c_client *i2c,
s5m_irq_exit(s5m87xx);
i2c_unregister_device(s5m87xx->rtc);
regmap_exit(s5m87xx->regmap);
kfree(s5m87xx);
return ret;
}

Expand All @@ -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;
}

Expand Down

0 comments on commit 621210e

Please sign in to comment.