diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-21 14:28:46 +0100 |
|---|---|---|
| committer | Wolfram Sang <w.sang@pengutronix.de> | 2012-03-07 19:06:53 +0100 |
| commit | 4ea1557ff7862f63511420395d16647b74ba6f5c (patch) | |
| tree | 319420a8e7d679af274d2abb8b9494d286b80701 /drivers/i2c | |
| parent | i2c: add CSR SiRFprimaII on-chip I2C controllers driver (diff) | |
| download | linux-4ea1557ff7862f63511420395d16647b74ba6f5c.tar.xz linux-4ea1557ff7862f63511420395d16647b74ba6f5c.zip | |
i2c-s3c2410: Convert to devm_kzalloc()
Saves remembering to call kfree(). There's some kfree()s used by the
resource still, these will be removed in 3.3 using the newly added
devm_request_and_ioremap().
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-s3c2410.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 4c1718081685..e6f982be89a8 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c @@ -890,7 +890,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) } } - i2c = kzalloc(sizeof(struct s3c24xx_i2c), GFP_KERNEL); + i2c = devm_kzalloc(&pdev->dev, sizeof(struct s3c24xx_i2c), GFP_KERNEL); if (!i2c) { dev_err(&pdev->dev, "no memory for state\n"); return -ENOMEM; @@ -1035,7 +1035,6 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) clk_put(i2c->clk); err_noclk: - kfree(i2c); return ret; } @@ -1061,7 +1060,6 @@ static int s3c24xx_i2c_remove(struct platform_device *pdev) release_resource(i2c->ioarea); s3c24xx_i2c_dt_gpio_free(i2c); kfree(i2c->ioarea); - kfree(i2c); return 0; } |