From patchwork Fri Nov 29 00:51:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 295060 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 51DEE2C0091 for ; Fri, 29 Nov 2013 11:51:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752633Ab3K2Avb (ORCPT ); Thu, 28 Nov 2013 19:51:31 -0500 Received: from perceval.ideasonboard.com ([95.142.166.194]:36170 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752545Ab3K2Ava (ORCPT ); Thu, 28 Nov 2013 19:51:30 -0500 Received: from avalon.ideasonboard.com (179.232-240-81.adsl-dyn.isp.belgacom.be [81.240.232.179]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 8218935A6D; Fri, 29 Nov 2013 01:50:44 +0100 (CET) From: Laurent Pinchart To: linux-i2c@vger.kernel.org Cc: Laurent Pinchart Subject: [PATCH 2/4] i2c: pca954x: Use devm_kzalloc managed allocator Date: Fri, 29 Nov 2013 01:51:23 +0100 Message-Id: <1385686285-23780-3-git-send-email-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1385686285-23780-1-git-send-email-laurent.pinchart@ideasonboard.com> References: <1385686285-23780-1-git-send-email-laurent.pinchart@ideasonboard.com> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org This simplifies error and removal paths. Signed-off-by: Laurent Pinchart --- drivers/i2c/muxes/i2c-mux-pca954x.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c index ce740f1..2880c38 100644 --- a/drivers/i2c/muxes/i2c-mux-pca954x.c +++ b/drivers/i2c/muxes/i2c-mux-pca954x.c @@ -187,16 +187,14 @@ static int pca954x_probe(struct i2c_client *client, struct pca954x_platform_data *pdata = dev_get_platdata(&client->dev); int num, force, class; struct pca954x *data; - int ret = -ENODEV; + int ret; if (!i2c_check_functionality(adap, I2C_FUNC_SMBUS_BYTE)) - goto err; + return -ENODEV; - data = kzalloc(sizeof(struct pca954x), GFP_KERNEL); - if (!data) { - ret = -ENOMEM; - goto err; - } + data = devm_kzalloc(&client->dev, sizeof(struct pca954x), GFP_KERNEL); + if (!data) + return -ENOMEM; i2c_set_clientdata(client, data); @@ -206,7 +204,7 @@ static int pca954x_probe(struct i2c_client *client, */ if (i2c_smbus_write_byte(client, 0) < 0) { dev_warn(&client->dev, "probe failed\n"); - goto exit_free; + return -ENODEV; } data->type = id->driver_data; @@ -251,9 +249,6 @@ static int pca954x_probe(struct i2c_client *client, virt_reg_failed: for (num--; num >= 0; num--) i2c_del_mux_adapter(data->virt_adaps[num]); -exit_free: - kfree(data); -err: return ret; } @@ -269,7 +264,6 @@ static int pca954x_remove(struct i2c_client *client) data->virt_adaps[i] = NULL; } - kfree(data); return 0; }