[PATCH 02/10] media: rc: gpio-ir-recv: use devm_kzalloc

[Ladislav Michl]

Use of devm_kzalloc simplifies error unwinding.

Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
 drivers/media/rc/gpio-ir-recv.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/media/rc/gpio-ir-recv.c b/drivers/media/rc/gpio-ir-recv.c
index 2f6233186ce9..fd5742b23447 100644
--- a/drivers/media/rc/gpio-ir-recv.c
+++ b/drivers/media/rc/gpio-ir-recv.c
@@ -139,15 +139,13 @@ static int gpio_ir_recv_probe(struct platform_device 
*pdev)
        if (pdata->gpio_nr < 0)
                return -EINVAL;
 
-       gpio_dev = kzalloc(sizeof(struct gpio_rc_dev), GFP_KERNEL);
+       gpio_dev = devm_kzalloc(dev, sizeof(struct gpio_rc_dev), GFP_KERNEL);
        if (!gpio_dev)
                return -ENOMEM;
 
        rcdev = rc_allocate_device(RC_DRIVER_IR_RAW);
-       if (!rcdev) {
-               rc = -ENOMEM;
-               goto err_allocate_device;
-       }
+       if (!rcdev)
+               return -ENOMEM;
 
        rcdev->priv = gpio_dev;
        rcdev->input_name = GPIO_IR_DEVICE_NAME;
@@ -206,8 +204,6 @@ static int gpio_ir_recv_probe(struct platform_device *pdev)
        gpio_free(pdata->gpio_nr);
 err_gpio_request:
        rc_free_device(rcdev);
-err_allocate_device:
-       kfree(gpio_dev);
        return rc;
 }
 
@@ -219,7 +215,6 @@ static int gpio_ir_recv_remove(struct platform_device *pdev)
        del_timer_sync(&gpio_dev->flush_timer);
        rc_unregister_device(gpio_dev->rcdev);
        gpio_free(gpio_dev->gpio_nr);
-       kfree(gpio_dev);
        return 0;
 }
 
-- 
2.11.0