From mboxrd@z Thu Jan 1 00:00:00 1970 From: Barry Song <21cnbao@gmail.com> Subject: Re: [PATCH 1/2] i2c-s3c2410: Convert to devm_kzalloc() Date: Sun, 29 Jan 2012 13:14:39 +0800 Message-ID: References: <1327152527-11364-1-git-send-email-broonie@opensource.wolfsonmicro.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <1327152527-11364-1-git-send-email-broonie@opensource.wolfsonmicro.com> Sender: linux-samsung-soc-owner@vger.kernel.org To: Mark Brown Cc: Jean Delvare , Wolfram Sang , Ben Dooks , linux-samsung-soc@vger.kernel.org, linux-i2c@vger.kernel.org List-Id: linux-i2c@vger.kernel.org 2012/1/21 Mark Brown : > 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 Reviewed-by: Barry Song > --- > =C2=A0drivers/i2c/busses/i2c-s3c2410.c | =C2=A0 =C2=A04 +--- > =C2=A01 files changed, 1 insertions(+), 3 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2= c-s3c2410.c > index 4c17180..e6f982b 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_devi= ce *pdev) > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0} > =C2=A0 =C2=A0 =C2=A0 =C2=A0} > > - =C2=A0 =C2=A0 =C2=A0 i2c =3D kzalloc(sizeof(struct s3c24xx_i2c), GF= P_KERNEL); > + =C2=A0 =C2=A0 =C2=A0 i2c =3D devm_kzalloc(&pdev->dev, sizeof(struct= s3c24xx_i2c), GFP_KERNEL); > =C2=A0 =C2=A0 =C2=A0 =C2=A0if (!i2c) { > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0dev_err(&pdev-= >dev, "no memory for state\n"); > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return -ENOMEM= ; > @@ -1035,7 +1035,6 @@ static int s3c24xx_i2c_probe(struct platform_de= vice *pdev) > =C2=A0 =C2=A0 =C2=A0 =C2=A0clk_put(i2c->clk); > > =C2=A0err_noclk: > - =C2=A0 =C2=A0 =C2=A0 kfree(i2c); > =C2=A0 =C2=A0 =C2=A0 =C2=A0return ret; > =C2=A0} > > @@ -1061,7 +1060,6 @@ static int s3c24xx_i2c_remove(struct platform_d= evice *pdev) > =C2=A0 =C2=A0 =C2=A0 =C2=A0release_resource(i2c->ioarea); > =C2=A0 =C2=A0 =C2=A0 =C2=A0s3c24xx_i2c_dt_gpio_free(i2c); > =C2=A0 =C2=A0 =C2=A0 =C2=A0kfree(i2c->ioarea); > - =C2=A0 =C2=A0 =C2=A0 kfree(i2c); > > =C2=A0 =C2=A0 =C2=A0 =C2=A0return 0; > =C2=A0} > -- > 1.7.7.3