From: Haojian Zhuang <haojian.zhuang-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> To: swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, arnd-r2nGTMty4D4@public.gmane.org, tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org Subject: [PATCH v2 7/9] i2c: pxa: use devm_kzalloc Date: Tue, 23 Oct 2012 00:08:57 +0800 [thread overview] Message-ID: <1350922139-3693-8-git-send-email-haojian.zhuang@gmail.com> (raw) In-Reply-To: <1350922139-3693-1-git-send-email-haojian.zhuang-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Use devm_kzalloc & add checking in probe() function. Signed-off-by: Haojian Zhuang <haojian.zhuang-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> --- drivers/i2c/busses/i2c-pxa.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 1034d93..7c8b5d0 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -1078,6 +1078,8 @@ static int i2c_pxa_probe_pdata(struct platform_device *pdev, struct i2c_pxa_platform_data *plat = pdev->dev.platform_data; const struct platform_device_id *id = platform_get_device_id(pdev); + if (!id) + return -EINVAL; *i2c_types = id->driver_data; if (plat) { i2c->use_pio = plat->use_pio; @@ -1094,29 +1096,23 @@ static int i2c_pxa_probe(struct platform_device *dev) struct resource *res = NULL; int ret, irq; - i2c = kzalloc(sizeof(struct pxa_i2c), GFP_KERNEL); - if (!i2c) { - ret = -ENOMEM; - goto emalloc; - } + i2c = devm_kzalloc(&dev->dev, sizeof(struct pxa_i2c), GFP_KERNEL); + if (!i2c) + return -ENOMEM; ret = i2c_pxa_probe_dt(dev, i2c, &i2c_type); if (ret > 0) ret = i2c_pxa_probe_pdata(dev, i2c, &i2c_type); if (ret < 0) - goto eclk; + return ret; res = platform_get_resource(dev, IORESOURCE_MEM, 0); irq = platform_get_irq(dev, 0); - if (res == NULL || irq < 0) { - ret = -ENODEV; - goto eclk; - } + if (res == NULL || irq < 0) + return -ENODEV; - if (!request_mem_region(res->start, resource_size(res), res->name)) { - ret = -ENOMEM; - goto eclk; - } + if (!request_mem_region(res->start, resource_size(res), res->name)) + return -ENOMEM; i2c->adap.owner = THIS_MODULE; i2c->adap.retries = 5; @@ -1209,8 +1205,6 @@ ereqirq: eremap: clk_put(i2c->clk); eclk: - kfree(i2c); -emalloc: release_mem_region(res->start, resource_size(res)); return ret; } -- 1.7.0.4
WARNING: multiple messages have this Message-ID (diff)
From: haojian.zhuang@gmail.com (Haojian Zhuang) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 7/9] i2c: pxa: use devm_kzalloc Date: Tue, 23 Oct 2012 00:08:57 +0800 [thread overview] Message-ID: <1350922139-3693-8-git-send-email-haojian.zhuang@gmail.com> (raw) In-Reply-To: <1350922139-3693-1-git-send-email-haojian.zhuang@gmail.com> Use devm_kzalloc & add checking in probe() function. Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com> --- drivers/i2c/busses/i2c-pxa.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 1034d93..7c8b5d0 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -1078,6 +1078,8 @@ static int i2c_pxa_probe_pdata(struct platform_device *pdev, struct i2c_pxa_platform_data *plat = pdev->dev.platform_data; const struct platform_device_id *id = platform_get_device_id(pdev); + if (!id) + return -EINVAL; *i2c_types = id->driver_data; if (plat) { i2c->use_pio = plat->use_pio; @@ -1094,29 +1096,23 @@ static int i2c_pxa_probe(struct platform_device *dev) struct resource *res = NULL; int ret, irq; - i2c = kzalloc(sizeof(struct pxa_i2c), GFP_KERNEL); - if (!i2c) { - ret = -ENOMEM; - goto emalloc; - } + i2c = devm_kzalloc(&dev->dev, sizeof(struct pxa_i2c), GFP_KERNEL); + if (!i2c) + return -ENOMEM; ret = i2c_pxa_probe_dt(dev, i2c, &i2c_type); if (ret > 0) ret = i2c_pxa_probe_pdata(dev, i2c, &i2c_type); if (ret < 0) - goto eclk; + return ret; res = platform_get_resource(dev, IORESOURCE_MEM, 0); irq = platform_get_irq(dev, 0); - if (res == NULL || irq < 0) { - ret = -ENODEV; - goto eclk; - } + if (res == NULL || irq < 0) + return -ENODEV; - if (!request_mem_region(res->start, resource_size(res), res->name)) { - ret = -ENOMEM; - goto eclk; - } + if (!request_mem_region(res->start, resource_size(res), res->name)) + return -ENOMEM; i2c->adap.owner = THIS_MODULE; i2c->adap.retries = 5; @@ -1209,8 +1205,6 @@ ereqirq: eremap: clk_put(i2c->clk); eclk: - kfree(i2c); -emalloc: release_mem_region(res->start, resource_size(res)); return ret; } -- 1.7.0.4
next prev parent reply other threads:[~2012-10-22 16:08 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-10-22 16:08 [PATCH v2 0/9] support pinctrl single in arch pxa/mmp Haojian Zhuang 2012-10-22 16:08 ` Haojian Zhuang [not found] ` <1350922139-3693-1-git-send-email-haojian.zhuang-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2012-10-22 16:08 ` [PATCH v2 1/9] ARM: mmp: select pinctrl driver Haojian Zhuang 2012-10-22 16:08 ` Haojian Zhuang [not found] ` <1350922139-3693-2-git-send-email-haojian.zhuang-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2012-10-23 10:05 ` Linus Walleij 2012-10-23 10:05 ` Linus Walleij 2012-10-22 16:08 ` [PATCH v2 2/9] pinctrl: single: support gpio request and free Haojian Zhuang 2012-10-22 16:08 ` Haojian Zhuang [not found] ` <1350922139-3693-3-git-send-email-haojian.zhuang-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2012-10-22 20:28 ` Tony Lindgren 2012-10-22 20:28 ` Tony Lindgren [not found] ` <20121022202805.GG4730-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> 2012-10-22 21:37 ` Tony Lindgren 2012-10-22 21:37 ` Tony Lindgren [not found] ` <20121022213709.GL4730-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> 2012-10-29 1:55 ` Haojian Zhuang 2012-10-29 1:55 ` Haojian Zhuang 2012-10-29 1:58 ` Haojian Zhuang 2012-10-29 1:58 ` Haojian Zhuang 2012-10-22 16:08 ` [PATCH v2 3/9] pinctrl: single: support pinconf generic Haojian Zhuang 2012-10-22 16:08 ` Haojian Zhuang 2012-10-22 16:08 ` [PATCH v2 4/9] ARM: dts: support pinctrl single in pxa910 Haojian Zhuang 2012-10-22 16:08 ` Haojian Zhuang 2012-10-22 16:08 ` [PATCH v2 5/9] document: devicetree: bind pinconf with pin-single Haojian Zhuang 2012-10-22 16:08 ` Haojian Zhuang [not found] ` <1350922139-3693-6-git-send-email-haojian.zhuang-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2012-10-22 22:44 ` Stephen Warren 2012-10-22 22:44 ` Stephen Warren [not found] ` <5085CC3F.30708-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> 2012-10-31 16:58 ` Haojian Zhuang 2012-10-31 16:58 ` Haojian Zhuang [not found] ` <CAN1soZy8xXGs8zEiZV0kV0dGVdXfZ9ogx83sFgPG76d0i8yH4A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2012-10-31 22:26 ` Stephen Warren 2012-10-31 22:26 ` Stephen Warren [not found] ` <5091A5AA.7000207-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> 2012-10-31 22:51 ` Haojian Zhuang 2012-10-31 22:51 ` Haojian Zhuang [not found] ` <CAN1soZyc8Kox__yOER82Oe5OtaLJWYAoMzgWGhEonTfdf11MqQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2012-11-01 0:25 ` Tony Lindgren 2012-11-01 0:25 ` Tony Lindgren 2012-10-22 16:08 ` [PATCH v2 6/9] tty: pxa: configure pin Haojian Zhuang 2012-10-22 16:08 ` Haojian Zhuang [not found] ` <1350922139-3693-7-git-send-email-haojian.zhuang-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2012-10-23 10:07 ` Linus Walleij 2012-10-23 10:07 ` Linus Walleij 2012-10-22 16:08 ` Haojian Zhuang [this message] 2012-10-22 16:08 ` [PATCH v2 7/9] i2c: pxa: use devm_kzalloc Haojian Zhuang 2012-10-22 16:08 ` [PATCH v2 8/9] i2c: pxa: configure pinmux Haojian Zhuang 2012-10-22 16:08 ` Haojian Zhuang [not found] ` <1350922139-3693-9-git-send-email-haojian.zhuang-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2012-10-23 10:07 ` Linus Walleij 2012-10-23 10:07 ` Linus Walleij 2012-10-22 16:08 ` [PATCH v2 9/9] pinctrl: single: dump pinmux register value Haojian Zhuang 2012-10-22 16:08 ` Haojian Zhuang [not found] ` <1350922139-3693-10-git-send-email-haojian.zhuang-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2012-10-22 22:27 ` Tony Lindgren 2012-10-22 22:27 ` Tony Lindgren
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1350922139-3693-8-git-send-email-haojian.zhuang@gmail.com \ --to=haojian.zhuang-re5jqeeqqe8avxtiumwx3w@public.gmane.org \ --cc=arnd-r2nGTMty4D4@public.gmane.org \ --cc=devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \ --cc=linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org \ --cc=tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.