From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6C3F037B01F for ; Thu, 30 Apr 2026 19:50:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777578629; cv=none; b=LaBUggx+rQlBbXE/zqHQEb53m5CkaFbFh8iwQ9Z8APaScYfOEer+EX9SGsSKmyuRo5JRhZtJRlRj1xBK8IdY92fppdBdFvqbMdaysmvXYqjRYi3fHNHRj7dMiXkEFOS45J3VaBC4XxVpEn/E207fgxxx25RGxZ2AoAGbtenH7hk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777578629; c=relaxed/simple; bh=Tdoogl+HBtsPgRwNf5eHEALjOEIOTVZNp1gxTw/GLaU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JervkPnJdVHYu1JDsUsesCVw664RaexExaZrXYVm/eVrP6URfyZXwi2j5V+ZHOlMn6054jgucf1leBJJdfBkS9AEeZhv5prxjuTxxwu5YTxTbDJruIgekB9yPPw6EIddbDdt+zXzhn/qKbce4lhrBFnAnpHzUBAaaDEUC0VEgAA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=cf1/zEKP; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cf1/zEKP" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-488a8ca4aadso15096525e9.3 for ; Thu, 30 Apr 2026 12:50:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777578627; x=1778183427; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sehIK1ss/UfV25ulny1ykipeeUWFbqMuTXJbr9AoQZc=; b=cf1/zEKPraVjUFuoC3aNJBzs65kJMkxVmwik6CdTgl0cjuIH6aBijTxFT8ogpoK4t5 vGlar+dg5ui8YasA/4tlZ48nFD0hoFe8cnU7RAl77x4pigUfug2zCf8Ed8kz8WKz+vpD TAlODavP8BWMBFRqMAnyX8S5yjvamG0jS6YM/OxGxJi7i2j1CG/qta+KV05ARozGw2Yy Z7F6frk43/D8h0pAbvYhf/UtSljwnzk7Iw2wyfJQmjZxzHW8euMzFOM6qxKDtKTM02j/ pJm6BSwSh9YPHKh9vxl8YDTzrOeC5PIVaxI5sHgPeNlGaswZyoSntKpYidHKZBeoWs2i AGIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777578627; x=1778183427; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=sehIK1ss/UfV25ulny1ykipeeUWFbqMuTXJbr9AoQZc=; b=UNicUPljA175jBWN7IpEcI2FyNmJMjhlVqreVVVgvvxD9bfeUtSJmvDOTNKLrAlBcK qdpEqq17NREZr1uZekrgBkbQ6ChyeLOqeUWJTiNEmF+B5Qd1zHQkrzi3bY2Z53bOgjf/ RBfXM7+Wbja21uNNur/nhTs9qpcC+cxFwLo8kH4BErLR4e8RyFsEgeYk7phfqkJyo8iX 7bCk/52eTD40UZmnNUjMXCRN9w0EFZJnBaCIWAv4jIZE4gmQJ3F7a7J1ci2fwhiX9d7Q dSoX+hbux9AwSty65y8TSXO9x6z3iZSX4MBqok/wQ2cBkTnLdF781QPkFoJAVR9S1c8V FKFQ== X-Forwarded-Encrypted: i=1; AFNElJ/cM4GsEGoYLzeVFk8mubRBsa7CUxAs79mbfR5Sryc9zD910PAPo6GKtw0Mr7IfGwupi+RiPmJmXlWIQsA=@vger.kernel.org X-Gm-Message-State: AOJu0Yyltwv6AIbLszNKCjt7wOyWyibTDqbtZNTWwI+Ld/MZcl0qap9E VkhhLIyAWUj1vZ/PL6nNpZNVVXsmM42ITOfpVii8QqrkQ434TDFBkK0M X-Gm-Gg: AeBDieul1kv7cf/qkFvLtcI8H+EeKoWyAp9p6XDvKzpT+tCnNZvSISFnqH5xwmmNfnS /rdOvXLwX2CbZOKnMqrI/LHl22JAfXtsx5ydi38rWJzA5lEihNb1FLwLgK89NkrCattX1Rf5qhj XrL4o/YU21osquS5RgHdpEdBwqVpm8FDOw4drKaQWkVPE+3mgV+RSJ+CeIACzhavq6Mn6nU+AB5 8HCtKFuILadWxLk3SzlwOFSO3JLfWcYTbuwM9VVrCiZAyOrD7Wz9XBGdHzdN3yLnJHvyEtVkfLR f7Hy1cklkWlkcHkyld7ACnR2W2IVBTUzj0TeeDvzQXJwwy+qog+Y8wzjMzL2+5+WuJPly44u4yV dZsu4bDrl2sxdRiTcxesxI2dKFetJ6sHjpFcWUAn4HU75sk794mlJWZdk061JiVLacqsOsS2FlH FdIoVme5jTGt7tMWiLC38xl31c3FBHFhhpz5zge9Q+MbEm3liqbo2OH9Wp2bjTnJhOkzfUWZM= X-Received: by 2002:a05:600c:699b:b0:488:ab26:8fe0 with SMTP id 5b1f17b1804b1-48a8446d81emr76044935e9.15.1777578626573; Thu, 30 Apr 2026 12:50:26 -0700 (PDT) Received: from osama.. ([2a02:908:1b6:8980:55a4:d495:8d6f:1416]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48a8eb75fc1sm3109615e9.7.2026.04.30.12.50.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Apr 2026 12:50:26 -0700 (PDT) From: Osama Abdelkader To: luca.ceresoli@bootlin.com, Jagan Teki , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Osama Abdelkader Subject: [PATCH v4 2/2] drm/bridge: chipone-icn6211: use devm_drm_bridge_add in dsi probe Date: Thu, 30 Apr 2026 21:49:43 +0200 Message-ID: <20260430194944.78119-2-osama.abdelkader@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260430194944.78119-1-osama.abdelkader@gmail.com> References: <20260430194944.78119-1-osama.abdelkader@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Use devm_drm_bridge_add() so the bridge is released if probe fails after registration, and drop drm_bridge_remove() in chipone_dsi_probe. Signed-off-by: Osama Abdelkader --- v4: drop drm_bridge_remove() in chipone_dsi_remove() v3: split the patch into two, one for i2c probe (bugfix) and one for dsi probe v2: devm_drm_bridge_add instead of drm_bridge_add --- drivers/gpu/drm/bridge/chipone-icn6211.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/bridge/chipone-icn6211.c b/drivers/gpu/drm/bridge/chipone-icn6211.c index 553a1df4688d..b12cd2690474 100644 --- a/drivers/gpu/drm/bridge/chipone-icn6211.c +++ b/drivers/gpu/drm/bridge/chipone-icn6211.c @@ -730,13 +730,11 @@ static int chipone_dsi_probe(struct mipi_dsi_device *dsi) mipi_dsi_set_drvdata(dsi, icn); - drm_bridge_add(&icn->bridge); - - ret = chipone_dsi_attach(icn); + ret = devm_drm_bridge_add(dev, &icn->bridge); if (ret) - drm_bridge_remove(&icn->bridge); + return ret; - return ret; + return chipone_dsi_attach(icn); } static int chipone_i2c_probe(struct i2c_client *client) @@ -767,10 +765,7 @@ static int chipone_i2c_probe(struct i2c_client *client) static void chipone_dsi_remove(struct mipi_dsi_device *dsi) { - struct chipone *icn = mipi_dsi_get_drvdata(dsi); - mipi_dsi_detach(dsi); - drm_bridge_remove(&icn->bridge); } static const struct of_device_id chipone_of_match[] = { -- 2.43.0