diff options
author | Sangbeom Kim <sbkim73@samsung.com> | 2012-01-20 02:09:11 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-03-06 12:46:36 -0500 |
commit | 621210e25d5de02dae111ad90548577dd64c7663 (patch) | |
tree | 300ea5085d61d2b0f6e2a0bfe39c90e3c6d5e835 /drivers | |
parent | 1773140feccf69528678348bb2d53b2c299ab4ee (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mfd/s5m-core.c | 5 |
1 files 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, | |||
77 | int ret = 0; | 77 | int ret = 0; |
78 | int error; | 78 | int error; |
79 | 79 | ||
80 | s5m87xx = kzalloc(sizeof(struct s5m87xx_dev), GFP_KERNEL); | 80 | s5m87xx = devm_kzalloc(&i2c->dev, sizeof(struct s5m87xx_dev), |
81 | GFP_KERNEL); | ||
81 | if (s5m87xx == NULL) | 82 | if (s5m87xx == NULL) |
82 | return -ENOMEM; | 83 | return -ENOMEM; |
83 | 84 | ||
@@ -126,7 +127,6 @@ err: | |||
126 | s5m_irq_exit(s5m87xx); | 127 | s5m_irq_exit(s5m87xx); |
127 | i2c_unregister_device(s5m87xx->rtc); | 128 | i2c_unregister_device(s5m87xx->rtc); |
128 | regmap_exit(s5m87xx->regmap); | 129 | regmap_exit(s5m87xx->regmap); |
129 | kfree(s5m87xx); | ||
130 | return ret; | 130 | return ret; |
131 | } | 131 | } |
132 | 132 | ||
@@ -138,7 +138,6 @@ static int s5m87xx_i2c_remove(struct i2c_client *i2c) | |||
138 | s5m_irq_exit(s5m87xx); | 138 | s5m_irq_exit(s5m87xx); |
139 | i2c_unregister_device(s5m87xx->rtc); | 139 | i2c_unregister_device(s5m87xx->rtc); |
140 | regmap_exit(s5m87xx->regmap); | 140 | regmap_exit(s5m87xx->regmap); |
141 | kfree(s5m87xx); | ||
142 | return 0; | 141 | return 0; |
143 | } | 142 | } |
144 | 143 | ||