i2c-s3c2410: Convert to devm_kzalloc()
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 21 Jan 2012 13:28:46 +0000 (13:28 +0000)
committerWolfram Sang <w.sang@pengutronix.de>
Wed, 7 Mar 2012 18:06:53 +0000 (19:06 +0100)
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>
drivers/i2c/busses/i2c-s3c2410.c

index 4c17180..e6f982b 100644 (file)
@@ -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;
 }