From patchwork Mon Mar 25 20:06:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 13602862 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 357ACCD11DD for ; Mon, 25 Mar 2024 20:09:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4295410E2BB; Mon, 25 Mar 2024 20:09:06 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.b="Bz0z2Sbr"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="bTTgB0bM"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="Bz0z2Sbr"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="bTTgB0bM"; dkim-atps=neutral Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by gabe.freedesktop.org (Postfix) with ESMTPS id BE0A410E322 for ; Mon, 25 Mar 2024 20:09:00 +0000 (UTC) Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [10.150.64.98]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 55A7A5CB57; Mon, 25 Mar 2024 20:08:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1711397339; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u6bV7OswU8lpSsBbxibb4Rx6kdN7Fkiy/hPFWQvHHpg=; b=Bz0z2SbrB9P/ivCjJ1JS00yA9jKTEx2N0sxkRvZOJBhGzHk9hHh6EOYLkot4/cHW8IW9TG GHj1iFXx1gaGTANL5NfeQRrrb9n7CgwdoW60+u+LeIfGjL5nvsdxgBjJs344XxaS2V95jK 6Vy3pzEa/Ov6ts4kAlzTdZlXm8vVnr4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1711397339; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u6bV7OswU8lpSsBbxibb4Rx6kdN7Fkiy/hPFWQvHHpg=; b=bTTgB0bMF+AvCfBjAQM7M0AaiB3ThjFdAVXMsHHshYVjzdTrWgkwbyuxBxLgRp5Tqf8tb8 xsw5wvlupYp11oCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1711397339; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u6bV7OswU8lpSsBbxibb4Rx6kdN7Fkiy/hPFWQvHHpg=; b=Bz0z2SbrB9P/ivCjJ1JS00yA9jKTEx2N0sxkRvZOJBhGzHk9hHh6EOYLkot4/cHW8IW9TG GHj1iFXx1gaGTANL5NfeQRrrb9n7CgwdoW60+u+LeIfGjL5nvsdxgBjJs344XxaS2V95jK 6Vy3pzEa/Ov6ts4kAlzTdZlXm8vVnr4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1711397339; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u6bV7OswU8lpSsBbxibb4Rx6kdN7Fkiy/hPFWQvHHpg=; b=bTTgB0bMF+AvCfBjAQM7M0AaiB3ThjFdAVXMsHHshYVjzdTrWgkwbyuxBxLgRp5Tqf8tb8 xsw5wvlupYp11oCQ== Received: from imap2.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id 045FE13A71; Mon, 25 Mar 2024 20:08:58 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap2.dmz-prg2.suse.org with ESMTPSA id 6C9hO9rZAWaVcAAAn2gu4w (envelope-from ); Mon, 25 Mar 2024 20:08:58 +0000 From: Thomas Zimmermann To: airlied@redhat.com, jfalempe@redhat.com, sui.jingfeng@linux.dev, maarten.lankhorst@linux.intel.com, mripard@kernel.org, jani.nikula@linux.intel.com, airlied@gmail.com, daniel@ffwll.ch Cc: dri-devel@lists.freedesktop.org, Thomas Zimmermann Subject: [PATCH v6 04/13] drm/ast: Allocate instance of struct ast_i2c_chan with managed helpers Date: Mon, 25 Mar 2024 21:06:49 +0100 Message-ID: <20240325200855.21150-5-tzimmermann@suse.de> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240325200855.21150-1-tzimmermann@suse.de> References: <20240325200855.21150-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spamd-Result: default: False [-0.30 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; R_MISSING_CHARSET(2.50)[]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; REPLY(-4.00)[]; BROKEN_CONTENT_TYPE(1.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_RATELIMIT(0.00)[to_ip_from(RL9pqk354j4esf7wsagg6iyf8a)]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; RCPT_COUNT_SEVEN(0.00)[10]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email]; FREEMAIL_TO(0.00)[redhat.com,linux.dev,linux.intel.com,kernel.org,gmail.com,ffwll.ch]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-0.00)[24.51%] Authentication-Results: smtp-out2.suse.de; none X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Replace kzalloc() with drmm_kzalloc() and thereby put the release of the I2C instance into a separate action. Avoids explicit error roll- back in ast_i2c_chan_create(). No functional changes. Signed-off-by: Thomas Zimmermann Reviewed-by: Sui Jingfeng Reviewed-by: Jocelyn Falempe --- drivers/gpu/drm/ast/ast_i2c.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/ast/ast_i2c.c b/drivers/gpu/drm/ast/ast_i2c.c index c3046223a4919..dc28a5cbb1c2a 100644 --- a/drivers/gpu/drm/ast/ast_i2c.c +++ b/drivers/gpu/drm/ast/ast_i2c.c @@ -107,7 +107,6 @@ static void ast_i2c_release(struct drm_device *dev, void *res) struct ast_i2c_chan *i2c = res; i2c_del_adapter(&i2c->adapter); - kfree(i2c); } struct ast_i2c_chan *ast_i2c_create(struct drm_device *dev) @@ -115,7 +114,7 @@ struct ast_i2c_chan *ast_i2c_create(struct drm_device *dev) struct ast_i2c_chan *i2c; int ret; - i2c = kzalloc(sizeof(struct ast_i2c_chan), GFP_KERNEL); + i2c = drmm_kzalloc(dev->dev, sizeof(*i2c), GFP_KERNEL); if (!i2c) return ERR_PTR(-ENOMEM); @@ -137,7 +136,7 @@ struct ast_i2c_chan *ast_i2c_create(struct drm_device *dev) ret = i2c_bit_add_bus(&i2c->adapter); if (ret) { drm_err(dev, "Failed to register bit i2c\n"); - goto out_kfree; + return ERR_PTR(ret); } ret = drmm_add_action_or_reset(dev, ast_i2c_release, i2c); @@ -145,8 +144,4 @@ struct ast_i2c_chan *ast_i2c_create(struct drm_device *dev) return ERR_PTR(ret); return i2c; - -out_kfree: - kfree(i2c); - return ERR_PTR(ret); }