From patchwork Tue Dec 17 07:01:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 302014 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 79AA82C007E for ; Tue, 17 Dec 2013 18:01:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752573Ab3LQHBn (ORCPT ); Tue, 17 Dec 2013 02:01:43 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:13591 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752390Ab3LQHBn (ORCPT ); Tue, 17 Dec 2013 02:01:43 -0500 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MXX00I2NVIUPEA0@mailout3.samsung.com> for linux-i2c@vger.kernel.org; Tue, 17 Dec 2013 16:01:42 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.48]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id EE.18.10132.5D6FFA25; Tue, 17 Dec 2013 16:01:41 +0900 (KST) X-AuditID: cbfee68d-b7ff46d000002794-ea-52aff6d54ffe Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 29.BB.20899.5D6FFA25; Tue, 17 Dec 2013 16:01:41 +0900 (KST) Received: from DOJG1HAN03 ([12.23.120.99]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MXX00HNDVITQU10@mmp1.samsung.com>; Tue, 17 Dec 2013 16:01:41 +0900 (KST) From: Jingoo Han To: 'Wolfram Sang' Cc: linux-i2c@vger.kernel.org, 'Jingoo Han' , 'Lars Poeschel' References: <001601cefaf3$940d0040$bc2700c0$%han@samsung.com> In-reply-to: <001601cefaf3$940d0040$bc2700c0$%han@samsung.com> Subject: [PATCH 12/13] i2c: viperboard: Use devm_kzalloc() functions Date: Tue, 17 Dec 2013 16:01:41 +0900 Message-id: <003001cefaf5$d6618590$832490b0$%han@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac7685PVHbujt8MeRNi0GNiruYn2+wAAiaOQ Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrFIsWRmVeSWpSXmKPExsVy+t8zA92r39YHGUx4LGtxeeElVouOv18Y LZasuMxusfLELGYHFo+NXcEefVtWMXqcPPWExePzJrkAligum5TUnMyy1CJ9uwSujN1nfzAV /OWquNjRz9rA+I6ji5GTQ0LAROLLzqvsELaYxIV769m6GLk4hASWMUrMWnidCaZofl8TM4gt JLCIUaLnsgFE0S9Gie1belhAEmwCahJfvhwGmyQCZD/7+JURxGYWyJaY+OAZO0SzrUTfymVg cU4BO4lbC38B2RwcwgIuEjt3W4GEWQRUJWYffwg2kheofPaKN+wQtqDEj8n3WCBGakms33mc CcKWl9i85i0zyBgJAXWJR391IS4wklj8ZyEzRImIxL4X7xghXjnGLjF5qjXEKgGJb5MPsUC0 ykpsOsAMUSIpcXDFDZYJwABAsngWksWzkCyehWTDAkaWVYyiqQXJBcVJ6UWGesWJucWleel6 yfm5mxgh8di7g/H2AetDjMlA6ycyS4km5wPjOa8k3tDYzMjC1MTU2Mjc0ow0YSVx3qSHSUFC AumJJanZqakFqUXxRaU5qcWHGJk4OKUaGFVktk91X3srOOTzj6lbrk362aJ18ePL7ibHua85 JoYs8z966V6kxi+rl1rTt35Xdp8y+/eRf+UH3R89Y/62nbVy+oNX603uFvQ6NP9y91R04/q7 aYOAmNDSI5Xuak8miU3vbM9W7/h8bvm16JNqRy++7AzJfXP4e9H3HOMIz+MiaxUc8r8e3D9N iaU4I9FQi7moOBEASbl5yd0CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrBKsWRmVeSWpSXmKPExsVy+t9jAd2r39YHGUz8JmlxeeElVouOv18Y LZasuMxusfLELGYHFo+NXcEefVtWMXqcPPWExePzJrkAlqgGRpuM1MSU1CKF1Lzk/JTMvHRb Je/geOd4UzMDQ11DSwtzJYW8xNxUWyUXnwBdt8wcoJVKCmWJOaVAoYDE4mIlfTtME0JD3HQt YBojdH1DguB6jAzQQMI6xozdZ38wFfzlqrjY0c/awPiOo4uRk0NCwERifl8TM4QtJnHh3no2 EFtIYBGjRM9lgy5GLiD7F6PE9i09LCAJNgE1iS9fDrOD2CJA9rOPXxlBbGaBbImJD56xQzTb SvStXAYW5xSwk7i18BeQzcEhLOAisXO3FUiYRUBVYvbxh2AjeYHKZ694ww5hC0r8mHyPBWKk lsT6nceZIGx5ic1r3jKDjJEQUJd49FcX4gIjicV/FjJDlIhI7HvxjnECo9AsJJNmIZk0C8mk WUhaFjCyrGIUTS1ILihOSs810itOzC0uzUvXS87P3cQIjvdn0jsYVzVYHGIU4GBU4uHlmL0+ SIg1say4MvcQowQHs5IIL0sBUIg3JbGyKrUoP76oNCe1+BBjMtCjE5mlRJPzgakoryTe0NjE zMjSyMzCyMTcnDRhJXHeg63WgUIC6YklqdmpqQWpRTBbmDg4pRoYE2oTxeadaZYwub/4jK+N cOSN3zEWv35kKTmyL920V23VI6m1N9e4ursli/TU5PZ+zLf0+dU/87XH7P23S+9OkXFkYzbs zVMU/B6n+qnj/aX581p1Jbtav+eWZ0/+/NRL4tT11hUe3q5MEz58fa8zJ/z/q9as2HXlbZ0r 970vSH7+6c2eXS/jlFiKMxINtZiLihMB1HsNmTsDAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Use devm_kzalloc() functions to make cleanup paths simpler. Signed-off-by: Jingoo Han Acked-by: Lars Poeschel --- drivers/i2c/busses/i2c-viperboard.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/i2c/busses/i2c-viperboard.c b/drivers/i2c/busses/i2c-viperboard.c index c68450c..6976e1c 100644 --- a/drivers/i2c/busses/i2c-viperboard.c +++ b/drivers/i2c/busses/i2c-viperboard.c @@ -367,7 +367,7 @@ static int vprbrd_i2c_probe(struct platform_device *pdev) int ret; int pipe; - vb_i2c = kzalloc(sizeof(*vb_i2c), GFP_KERNEL); + vb_i2c = devm_kzalloc(&pdev->dev, sizeof(*vb_i2c), GFP_KERNEL); if (vb_i2c == NULL) return -ENOMEM; @@ -394,14 +394,12 @@ static int vprbrd_i2c_probe(struct platform_device *pdev) if (ret != 1) { dev_err(&pdev->dev, "failure setting i2c_bus_freq to %d\n", i2c_bus_freq); - ret = -EIO; - goto error; + return -EIO; } } else { dev_err(&pdev->dev, "invalid i2c_bus_freq setting:%d\n", i2c_bus_freq); - ret = -EIO; - goto error; + return -EIO; } vb_i2c->i2c.dev.parent = &pdev->dev; @@ -412,10 +410,6 @@ static int vprbrd_i2c_probe(struct platform_device *pdev) platform_set_drvdata(pdev, vb_i2c); return 0; - -error: - kfree(vb_i2c); - return ret; } static int vprbrd_i2c_remove(struct platform_device *pdev)