From 5f509ff0849bee2febc044068978ca86f3740843 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Sun, 2 Sep 2012 11:58:59 +0800 Subject: [PATCH] --- yaml --- r: 328451 b: refs/heads/master c: 5b4254386bf9a96dfcef9ec8e099bd06fe3e6896 h: refs/heads/master i: 328449: 094b3bfd518168db12255dd56badcb9a4d1572e4 328447: b003e5e59922d0e9458ebf4af7243454989672f3 v: v3 --- [refs] | 2 +- trunk/drivers/gpio/gpio-wm8350.c | 19 +++++-------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 21925d54be7b..fe4b774dea86 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 718bc6e33f33914690ba1b757de2327da7522a87 +refs/heads/master: 5b4254386bf9a96dfcef9ec8e099bd06fe3e6896 diff --git a/trunk/drivers/gpio/gpio-wm8350.c b/trunk/drivers/gpio/gpio-wm8350.c index a06af5154838..fb4293889392 100644 --- a/trunk/drivers/gpio/gpio-wm8350.c +++ b/trunk/drivers/gpio/gpio-wm8350.c @@ -116,7 +116,8 @@ static int __devinit wm8350_gpio_probe(struct platform_device *pdev) struct wm8350_gpio_data *wm8350_gpio; int ret; - wm8350_gpio = kzalloc(sizeof(*wm8350_gpio), GFP_KERNEL); + wm8350_gpio = devm_kzalloc(&pdev->dev, sizeof(*wm8350_gpio), + GFP_KERNEL); if (wm8350_gpio == NULL) return -ENOMEM; @@ -131,30 +132,20 @@ static int __devinit wm8350_gpio_probe(struct platform_device *pdev) ret = gpiochip_add(&wm8350_gpio->gpio_chip); if (ret < 0) { - dev_err(&pdev->dev, "Could not register gpiochip, %d\n", - ret); - goto err; + dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret); + return ret; } platform_set_drvdata(pdev, wm8350_gpio); return ret; - -err: - kfree(wm8350_gpio); - return ret; } static int __devexit wm8350_gpio_remove(struct platform_device *pdev) { struct wm8350_gpio_data *wm8350_gpio = platform_get_drvdata(pdev); - int ret; - - ret = gpiochip_remove(&wm8350_gpio->gpio_chip); - if (ret == 0) - kfree(wm8350_gpio); - return ret; + return gpiochip_remove(&wm8350_gpio->gpio_chip); } static struct platform_driver wm8350_gpio_driver = {