From nobody Mon Jun 15 23:16:57 2026 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (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 EB2E8310645 for ; Tue, 14 Apr 2026 18:05:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776189925; cv=none; b=criHllue5ezDM0TEHuhI/pJTb3WgvUpcJUbRP6iXOePoy+lmA0fuKTCi5mJnKHPiuLNud8y0yWrUQTwcBb/yKqbOOWwofDuoPWsPS2KjlX/SQ8DicXjPJ/k1EvfedNzyFFdGVVv4aNNtL8VU4QIrpidv/ADAYaQajEvjWAdnJew= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776189925; c=relaxed/simple; bh=M4q+8/bTVlW2BQeOKGd25ffcx51lHTwDeLM/yh++/G0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=oZ/oLV40t9dpYYv9Aju3WPY4+nKD+DlhkeNWGxdLykvcbCqCV+c6Gv6dgUZjiaTyJJVKr6qG8sAjchbRbZo4Na52PJ5pv9pifZttV2cuStijJqOsmGHqsqa2jPoBdUxFSxwofZ8e89AgyZlgE17L39yaZLSSy/CQL28NXQmX46g= 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=cfb0VAkX; arc=none smtp.client-ip=209.85.128.45 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="cfb0VAkX" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-488ba840146so58038345e9.1 for ; Tue, 14 Apr 2026 11:05:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776189922; x=1776794722; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=fXXwUnGdo3Yx9sP3zR3t7iA+9QFee9LB/bN9Dc41ll8=; b=cfb0VAkXewknlqX4OfnX8iOHqd4cHzE+tvJqMjzSVttFJOoqRxb929sJ1YBiCa8h8G 94OSzNqoZ6jLVGQ84I+9UdILR28n258xqi6zCrGZRNmygm+QygEqSY5z7bytD2BlACNV OM2TQ6xkYtjMplCOV8MrKoWEESEP2Y8/LldPK7PMXHRe6CL5haus/9HoHBAnk7sZzbtS ZVhL84RlDQOUYLtmQiS/MNsjUqrfLJVhEe9LvYYWX8aFIHgEPz+Ll/jOfnhsE/5qOhNc CHtnoKlyXFWSy1bT8QYjqaa3mlkrDSiIGrIUJhJkWG0XOc9JqrjkI54SiF5CUffCkZth 3DQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776189922; x=1776794722; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=fXXwUnGdo3Yx9sP3zR3t7iA+9QFee9LB/bN9Dc41ll8=; b=CUMEC2pypit5Eqz1GmC8Nx1cgptob3iHENJUSbDXE/wxhlIsJEFqjcv175OL9N6rxI a40SIEN2z0Tdy9jDKUQfA5IVmCctSo9/YnnNWqh0LA3tjq1+Yj8jpcCSRngWB3cxD3tr RivKcImcLD+7spAhEpqDlGV7x7BUteLY6eVWiJgcsQuntlgf3HJAAmnpeyAV7E0C1eJE C+4/mgBw3D4ocF/BtwPORHEKeRJu5naKUonPwJh7qO6ATGdZYQOd7EsIUJjR3AyWpczI VmrwhYr4GCW8tnm7uFC5ICPUBR+/lTyrfMtc52+WpbzSyPmwRPuGHDGOGV+fTQHUsMjs bojA== X-Forwarded-Encrypted: i=1; AFNElJ8YKQqxPzVNd1nY2gC1I1JK3rfMOr7zkhh13me45eH06JFg8XBhwohozP772EiGroPbFqzgylqoP52EYSk=@vger.kernel.org X-Gm-Message-State: AOJu0YwFmi3vAJadMPEu2TSt5d+Ge8qqEzQqNYG+FonAQz2/aIJ5qwJJ G4rEnT9S47jjq4hnEGHOwWVm37HtvMILXSc4vMGBVbYhMVwTKoBueSoC X-Gm-Gg: AeBDieskanhvqzGY2uguy1IJZuYiwRiDChv6qLxYSLmpZI+p+C/7VhEYdUSOaWmcrHL Xe9f75V5qGcePOPipI6Wdx+NtwkxnZBIm+sklNlUjsPEHsun7O2TQcr8zNDPEaPACYbmTvSNAhO JEQS1smsr+OQPLt2+SeOtELnTot2TjC17j56LYmYJZIW0R1G/+U9FZvIM0zQ5ALDWObOB4m3NHK zrisDvSTvpMg88DoGzDWjXVitKuijx4l9cakekstNQ1hG6kFCwea3+nf7/r4EMNV4JKoqKdIcDT P4uHsBt5TipAwW4VVEmnjiVgWzVq6SNBVraywiBWQkG1XLBBK0ilaXt66sAfKjblfrddGRYJshE EO4a2hdSlfaBYqm5NQ+uC7/Tp/dCM+Nd7KCbgViXJhEkLa85ZJBcB/IM/kCNEgQ6qhua6vVRVln v2PGYlPqvPFOhBeA4I6uJ/yAXQ9jmye7PoTT5kD5E1309KAknOJ4V/uQIUqzI0 X-Received: by 2002:a05:600c:8b38:b0:488:be58:bb77 with SMTP id 5b1f17b1804b1-488d6890ee3mr231361435e9.30.1776189922119; Tue, 14 Apr 2026 11:05:22 -0700 (PDT) Received: from osama.. ([2a02:908:1b6:8980:cb49:f403:bb20:cc84]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43d6ffd3880sm28095884f8f.7.2026.04.14.11.05.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Apr 2026 11:05:21 -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 v2] drm/bridge: chipone-icn6211: use devm_drm_bridge_add Date: Tue, 14 Apr 2026 20:05:17 +0200 Message-ID: <20260414180518.160801-1-osama.abdelkader@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use devm_drm_bridge_add() so the bridge is released if probe fails after registration, and drop drm_bridge_remove() from DSI remove. v2: devm_drm_bridge_add instead of drm_bridge_add + manual remove paths Signed-off-by: Osama Abdelkader --- drivers/gpu/drm/bridge/chipone-icn6211.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/bridge/chipone-icn6211.c b/drivers/gpu/drm/bri= dge/chipone-icn6211.c index 5bee10c64265..4bc98c45f65f 100644 --- a/drivers/gpu/drm/bridge/chipone-icn6211.c +++ b/drivers/gpu/drm/bridge/chipone-icn6211.c @@ -5,6 +5,7 @@ */ =20 #include +#include #include #include #include @@ -730,12 +731,11 @@ static int chipone_dsi_probe(struct mipi_dsi_device *= dsi) =20 mipi_dsi_set_drvdata(dsi, icn); =20 - drm_bridge_add(&icn->bridge); - - ret =3D chipone_dsi_attach(icn); + ret =3D devm_drm_bridge_add(dev, &icn->bridge); if (ret) - drm_bridge_remove(&icn->bridge); + return ret; =20 + ret =3D chipone_dsi_attach(icn); return ret; } =20 @@ -758,20 +758,17 @@ static int chipone_i2c_probe(struct i2c_client *clien= t) dev_set_drvdata(dev, icn); i2c_set_clientdata(client, icn); =20 - drm_bridge_add(&icn->bridge); + ret =3D devm_drm_bridge_add(dev, &icn->bridge); + if (ret) + return ret; =20 ret =3D chipone_dsi_host_attach(icn); - if (ret) - drm_bridge_remove(&icn->bridge); return ret; } =20 static void chipone_dsi_remove(struct mipi_dsi_device *dsi) { - struct chipone *icn =3D mipi_dsi_get_drvdata(dsi); - mipi_dsi_detach(dsi); - drm_bridge_remove(&icn->bridge); } =20 static const struct of_device_id chipone_of_match[] =3D { --=20 2.43.0