From nobody Sat Feb 7 21:08:12 2026 Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) (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 B01D1378D75 for ; Fri, 30 Jan 2026 11:10:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769771457; cv=none; b=Q8H5vL91ApTgHWNJ4qcGJoRz5f7FggEh+Hl4qB/bt4fpGuPdqO19QEVRpZMntvAbijqMhOfr1GI54YhnaxN9mzUiOl4g0MPAeZ1D82DlRI2XO4XrjoEk4Ya44rlYn80lB3BtZErIfhJ2inrRtw+7JB9cxvpkqYAzM7N8GOStCrs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769771457; c=relaxed/simple; bh=rtfoSM7z1weGnv/Q0GoqC5/5YEvV7kYGC/IYA4jYkNM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uJ+yNug0t96AwK2Zs6hlDorjyQLwuuBWZk3Ve77U+KHqSnheFKCgwbt7SFrmrn1xrAN5JouHBeaMl/HgEY9DrFlQ5URM5dZDYOmbqyFcGAL3+zgTQ0T18xFLpGBtwa8Wq/USCKkdBENMsS4NSJcWvmAfHzy/PvnAMMNGt57yVy8= 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=TCHJhMPk; arc=none smtp.client-ip=209.85.218.51 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="TCHJhMPk" Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-b87677a8abeso303586766b.1 for ; Fri, 30 Jan 2026 03:10:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769771453; x=1770376253; 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=RbxJ+mU3rm9LI/07bt3ncSPMi5OQc7Z/9GbRUILG9EE=; b=TCHJhMPkl+A1PFA4mlvtCxCy+Y0UUVxRIctB2EEIp+zeKCpUpVs86MUq8rwG3FjPjZ DOTo8cXXyT0MM/PyrDZDDL9TbvxrUTbIoS2N0sSH6l2o587utD/+STGz49Yx8Hkk5YRR AYSQcZG3JbrBNdIIExPMLYh9cez8Hja8Qs9lAhtekeAvMNyAr24deqtUfhvLNLulYv8o 1VcOKtcmUd+wyR7zrbOJhAXbieHkthbY+gV9SxT+evw8htnNPs1WjRvoBhPfyG/4CNuM xjsfp35R6CETg/ENahsAFAlTG2F7QFIlvrY0Wjt+ME4CweYCPqEB5CNj4KCPw9YWYk6/ gyGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769771453; x=1770376253; 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=RbxJ+mU3rm9LI/07bt3ncSPMi5OQc7Z/9GbRUILG9EE=; b=NJo19Wh/OCuK4PwKR/ToT+JYO2T7Zb10qzkQYkZ9vMHKM0akriHaziwm3lgwtJw/Vf zpPblNoSCI9YKI10zClBK/evBK1WgSX7FCA7WwVeLabWnEfR4z65oXv0rerWi+wtSCcx qGvRQo+KH6kzla1JRRXdBB9fpzkagSdDBiNgleIrbsWxf2fRFVt1AGIWmqfiAskqbPw0 MpY3jhz0lyEWoClV5sZKf+EQU6N7acp2pjV2+xbeGxbeZJzpAnwbdWHThxSphBT7QmnE dfFCvAQr+EJ2m1gtw0KPVL2Q2sze+BPZAG/dMXJXSUY40HHvGJ8tpYXOZ+h0ZiqB5S+p R3tw== X-Forwarded-Encrypted: i=1; AJvYcCWiJ3xJBegJuDJ1GZVEeum1/n24fuuKOWuzBzYGJMLa18KexiFnUFBrB+BUwVdz9ZDKeKrPBS3vnoRhxx4=@vger.kernel.org X-Gm-Message-State: AOJu0YwRkHbGgQTnLffjh2kanYDN4xUNayas0Jn2gq/AjMZFaFcDXrSQ LzzuHIxcDpR0lnwt/EFamXV3QNL+NrJRoPoF+izXchbJvGJeF+b8jUw0 X-Gm-Gg: AZuq6aJRGSnbWGq9HIflkLdzx53etGh0bXPwI68xO28sL4s0d+nrJTpqbRlKjulPsyk xHPYj0MRpYkfdnu7UIKHwaR2zLaewsdwpn3HlfB2zNrZafqwy71Br1UsEPSCERsg60Yu9Uv/OhK Ky+/FARsvmRxnK3o8ZSKXtlJZMMUhF11ydwr6PGLbGOEvAwIqxEpKT4SpBb/2bL5lJQUs7jVAMA mVp1eE1fVXeoPHCKkQv9G6fQhyuoh1cIIgs/jB1edXRhcLkF0xZuTIn7BJ1MykazwOKbVXmi1Ue NlBrKudYxDW/leR7/ZmUA+H+zkf1JYGzHv1/0e/GY5GAshXjhw7/vqVuNUqhUMHebXJ9MtqR9kP VmU1VobCgYBdbBuWb9jcLKsj9e2/7pNqnpU9mSSUzynOv59WsKO9G5cMEQnxC+hkTn06dpVd44A BLMv9iBmiOeiYPRaymYPA53nj+Q1cPr64uYiyEGVgV X-Received: by 2002:a17:906:dc92:b0:b86:e938:1b3a with SMTP id a640c23a62f3a-b8dff53de9dmr126132366b.17.1769771452761; Fri, 30 Jan 2026 03:10:52 -0800 (PST) Received: from NB-6746.corp.yadro.com ([188.243.183.148]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8dbeffedd3sm396035666b.29.2026.01.30.03.10.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jan 2026 03:10:52 -0800 (PST) From: Artem Shimko To: andi.shyti@kernel.org, p.zabel@pengutronix.de, mika.westerberg@linux.intel.com, andriy.shevchenko@linux.intel.com, jsd@semihalf.com Cc: Artem Shimko , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 2/2] i2c: designware-platdrv: fix cleanup on probe failure Date: Fri, 30 Jan 2026 14:10:37 +0300 Message-ID: <20260130111039.874548-3-a.shimko.dev@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260130111039.874548-1-a.shimko.dev@gmail.com> References: <20260130111039.874548-1-a.shimko.dev@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: quoted-printable Content-Type: text/plain; charset="utf-8" Simplify the error handling in dw_i2c_plat_probe() by consolidating cleanup operations directly in the error path instead of using a goto label. This eliminates the goto statement, makes the error handling more transparent, and reduces code indirection while maintaining identical cleanup behavior on probe failure. Signed-off-by: Artem Shimko Acked-by: Mika Westerberg --- drivers/i2c/busses/i2c-designware-platdrv.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/buss= es/i2c-designware-platdrv.c index 88e70970c72c..74246fcd5138 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -292,14 +292,11 @@ static int dw_i2c_plat_probe(struct platform_device *= pdev) pm_runtime_enable(device); =20 ret =3D i2c_dw_probe(dev); - if (ret) - goto exit_probe; - - return ret; + if (ret) { + dw_i2c_plat_pm_cleanup(dev); + i2c_dw_prepare_clk(dev, false); + } =20 -exit_probe: - dw_i2c_plat_pm_cleanup(dev); - i2c_dw_prepare_clk(dev, false); return ret; } =20 --=20 2.43.0