From nobody Thu Apr 9 05:47:44 2026 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (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 360B21E98E3 for ; Wed, 11 Mar 2026 07:52:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773215575; cv=none; b=BbltL891IPyxq7sv9q1chsm1KUPrNul1HVCkLMYEUpfc5IPZiGkWxlCIgH1v1I+bvEewetrlCIrJ12BpbjC9TVjhmq+Rt/n3NmX0ZHM+8p7zvrcyltncNCY5uXTFkk+RFx64D8PLuTlwKswQmtAw8L0PajetJQpjOipbmx8PLwU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773215575; c=relaxed/simple; bh=dh3HpoAtXE8uw7nBOrcGhCCgEUFGlm+/z1/p3QFqscs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qSMo6Ylmh80wzW3MNeDqLN+d1P49HuLONy2UwGZ6wajLomkznF4xVRaQp6OQqmJQX3jUE4bkef0+GJSc/+1wPdtWlJ7G9IuD4xrOkxnKhjQX1zsTCn9ytq6LQ18eWRYYCdEcDe3ukTqvGx3VUCaFKthqBeU12mirzmb7EYyXQPE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=bVXS7Dwi; arc=none smtp.client-ip=209.85.216.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="bVXS7Dwi" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-356337f058aso8096844a91.2 for ; Wed, 11 Mar 2026 00:52:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1773215571; x=1773820371; 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=NLaqL6RDjLUDRC9IFh+xvK4vJysRmVxopr+1H3G1aWA=; b=bVXS7DwiBUPSQTmMkmbqY3aQ5/eJ2rQ3HE8a75LgFjhIPfQDiHNyt2o1sfrNZa+ZI8 sm5BrYy+re45HLri9lF5Q4PEWNpD9JRWFvzAKxhk4RXkP4+61eu4pKnFUEWJXiAdVe7v RtV8o298J8uiNtqOhRuX9sdvNBO0OoMO5d/oI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773215571; x=1773820371; 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=NLaqL6RDjLUDRC9IFh+xvK4vJysRmVxopr+1H3G1aWA=; b=qdSU8d/GuwaKrR4M7/DBrJpRWGDAEMpYkknfLOybG/eOQBcO7IDnuOFnJ/ioEZAp7h PEYUCStd5SWOkI2+IynOpbp6otV4Moxg2FEGoxUlMp0aEgMVvziB/XH8lEZubL75/GZt LNt2MIC7c0CsLs3owfVc5+eOV9TuscjwSsGgLTkw+wujoPo4yPjN3P9ooMinAYdIfCiP q1nJQDeGts++7AplE3jMi5NMyCIjZJ6Z24FXymUaq9iistgMZaYvsBS8HIXbjuYpGCIa T/Hc6j/KLoPNLd5xfDP+tazgk99hG+DzoNSRULzbk90BlgO3GZW94wB2RWH1s0N33DfI OQtw== X-Forwarded-Encrypted: i=1; AJvYcCVspAX6igZZjo+/eXhPZXRyCSg9ui7WRXNbJok+KAIWoEHMfXu2OlAcpp73VDzhjCFNUmQgkfYdDiiQ8Go=@vger.kernel.org X-Gm-Message-State: AOJu0Yxlu9UJrWYd1emMvTsXR0664R99/dv8nel6C6ropOp6LqdfQB3L qQs4fH2mVvi7epbKMbU1dsNDheU41p4TVF58gBNH0y4nJL2NZF1wjpv/zNvsGK6C9g== X-Gm-Gg: ATEYQzw1Q7+P18h429ryFOko+4g4ScgANKUsTJHCmkeUhl447I4Z3wlHVpjFi46h8r+ 4zDAXLuH/7FJew0dT/RNtCIQ5lubUkE/K5bouJTx6En/8NJi7I1tiI51aOBuE3wUvdYZnR2UQYM CM02DsesFR+49lFMm2P5Pe5uI+/ihyFFfcZD3JZHf2EfVir7OcRClm/Bu/DuCjF8rIk/MbxZTzy /iRb+aq+pVK+47m2KvuvwMbaVHUQ93hyPB/0f7LPW3g4HU0hxt3a4x1JV7UOl2xOGUwIRMJxBFN aEZ1V89Uw0sXi9IgVpBl5I670YrpI4hFghpTLPKUiEtaLu+c66SiOzz+T2PMfw6U2YjZtlnJNCQ i9IXIAtytqU/5ZcpJwpBlhlg9Yn04blVEp4CSH0WiuzqcNpXAH21PEwYcWdEHD0H4IYq/p1lTQZ 7LGX8wclabANFogbaNN/Gw2z+jMPtj4N8TPfIMncF4D2rl693tVL8D75jFdPwyMLnCGSbup/3P+ AOvtDSD X-Received: by 2002:a17:90b:2fcf:b0:359:91a0:98fc with SMTP id 98e67ed59e1d1-35a012eabfcmr1678387a91.21.1773215571523; Wed, 11 Mar 2026 00:52:51 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2a00:79e0:201d:8:805b:14e9:f783:bcae]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35a0236f79asm727816a91.6.2026.03.11.00.52.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2026 00:52:50 -0700 (PDT) From: Chen-Yu Tsai To: Matthias Brugger , AngeloGioacchino Del Regno , Ryder Lee , Lorenzo Pieralisi , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Manivannan Sadhasivam , Rob Herring , Bjorn Helgaas Cc: Chen-Yu Tsai , Bartosz Golaszewski , linux-pci@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v5 4/7] PCI: mediatek-gen3: Add error path for resume driver callbacks Date: Wed, 11 Mar 2026 15:52:19 +0800 Message-ID: <20260311075223.3303497-5-wenst@chromium.org> X-Mailer: git-send-email 2.53.0.473.g4a7958ca14-goog In-Reply-To: <20260311075223.3303497-1-wenst@chromium.org> References: <20260311075223.3303497-1-wenst@chromium.org> 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" The resume callback currently does teardown in the conditional block directly. This is going to get ugly when the pwrctrl calls are added. Move the teardown to a proper error cleanup path. Reviewed-by: AngeloGioacchino Del Regno Reviewed-by: Bartosz Golaszewski Reviewed-by: Manivannan Sadhasivam Signed-off-by: Chen-Yu Tsai --- Changes since v3: - Dropped probe function error path; covered in previous patch --- drivers/pci/controller/pcie-mediatek-gen3.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/pci/controller/pcie-mediatek-gen3.c b/drivers/pci/cont= roller/pcie-mediatek-gen3.c index 1b6290f2c360..22a16e4ebc76 100644 --- a/drivers/pci/controller/pcie-mediatek-gen3.c +++ b/drivers/pci/controller/pcie-mediatek-gen3.c @@ -1304,14 +1304,16 @@ static int mtk_pcie_resume_noirq(struct device *dev) return err; =20 err =3D mtk_pcie_startup_port(pcie); - if (err) { - mtk_pcie_power_down(pcie); - return err; - } + if (err) + goto err_power_down; =20 mtk_pcie_irq_restore(pcie); =20 return 0; + +err_power_down: + mtk_pcie_power_down(pcie); + return err; } =20 static const struct dev_pm_ops mtk_pcie_pm_ops =3D { --=20 2.53.0.473.g4a7958ca14-goog