From nobody Tue Feb 10 16:44:09 2026 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (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 385A5320A15 for ; Thu, 23 Oct 2025 13:58:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761227913; cv=none; b=CNgZxeaAfDyyt3i8blo2lZxmadtkARdICKb5NZMQ6Y6EOPMAi8+awNCVlb74oUf8QeaPqnG1DnE6asiDeNl/1DhgyQuVK2JDzvDxblmHkXQoMb5WaV5Gu6DQGk0fK71JpwlKUQcGPNLuNofHsYRtEQdbc0IH2o3UldGPlcSglxs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761227913; c=relaxed/simple; bh=7pVJRtjZLD5TeJtHqNBvULeyoq1fs96v67StzdBP0ew=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jLyCimgPRZ17PKOUDZgP+9z1P16xThOnRF63HCqPC+kEWsOiaGNv3+CLm4VfTVKf5t1QnH25WwijBFPW9hXFHKqWOvoWaycVunacCVnPiU28BwD/OLmqKwuLsQHuWLc6NhPIn37vMm26v8Qo/sRDiKHdmEJVh2owAcPHbSqLs2s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=tuxon.dev; spf=pass smtp.mailfrom=tuxon.dev; dkim=pass (2048-bit key) header.d=tuxon.dev header.i=@tuxon.dev header.b=LQJ+609g; arc=none smtp.client-ip=209.85.208.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=tuxon.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=tuxon.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=tuxon.dev header.i=@tuxon.dev header.b="LQJ+609g" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-6399328ff1fso1590140a12.0 for ; Thu, 23 Oct 2025 06:58:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tuxon.dev; s=google; t=1761227910; x=1761832710; 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=hv0OLxIw6eR8M9PP1FC7Hsyw74xGUijbxOyWvfPyb1o=; b=LQJ+609go0icKvbN8Uet5pMxn6/AlqaTxce8+pasVmB3ZC3AXx9YRuqHgprqUefdSc fchfo24fM+lRAIqszy2WljET4L+jwM1j+g9rSazouUO6NHljr4yZbD7Oz7WtI8f6RLIN gKKSzgpTZIt94BUxo/rhy6ka4hntaQMNwAVYGy8GzS8ttg+qRsaqR4OmJN9CUMNptu+W XUfwLQVm2Uv5GhFSzIeUw8vzm2dazWlYJcm405nJswMHfZel4Cy0IJtz51qfTx/bq+sw 55nrg5PAu0nwGeA82ZGAVPzJQf0GF3tD5wnTvYKq6/vnMK/jo5laLeuTdW4/7e8Brdss LzJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761227910; x=1761832710; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hv0OLxIw6eR8M9PP1FC7Hsyw74xGUijbxOyWvfPyb1o=; b=HGHasg3sSeP8WaC3fSYqjUm48/xJ1IIx4RrxPFsvCcQAwU0kMWZkejb4AVdVcg9diT if8c8SHyNv+CGI16/GsaCXJetrAjgQCciWUMrkMhQBIP6NNSDzt/sBup1PExOavNvNh5 Y+BZzInGLdAncDVGBg9nX0AAbRX/w3+cb61qLMcrD8IDS+qgB47W+a7HDmElOgW6cHtS iCeiuoWdCeelU+ElGavRWsXuysIynHOo5G550al6uJ/CXDM7urPt250pI81i4fXKtyog Ic318IcUPHnz+ucdbEEtOf6VvTtNUyh0vvutX/8I1lFqDChW6vNi6Q4MYgF2Z+ga8U3B vf/w== X-Forwarded-Encrypted: i=1; AJvYcCUKvQTk94T5XNYtWdIESkNdeLBnTrn+wDZsZHW5wXPXM2Moow5SKgNBFbN/qjB2jnA7kqiMcVAAGox03ns=@vger.kernel.org X-Gm-Message-State: AOJu0YwLYB7KMT/NnBQGoPhEjFbdXFSHLL+MjLwkve1Vui0OrPxhVLfg d305yAkCCo69r3IYKNFVjqfaFBC9nZUp7QAw3JegYFr6YBK2nGS5961/E5Y/9AjhMRE= X-Gm-Gg: ASbGncsyUq4it3+dz9L90PLJ8f67w30aJc88jhjJUOOlFAwIAocmmH+dYOHLdYnPI6l fDPQYT9IYo+hdfyYGyWE8gKF8h4onOpRrd7US2bjXpFb4MahGBvvAI3uvmOCu+vL3anyRk9V8yE 4s315tIwS8olAUWsQYaR4Nwtt2LDQ236E2AMdk6PkP/NHkA9zRZRB82EMk1ibwt+w9urJhur6xq hy63JHV2Z9/WpSepecM+IZFaitSMujyp4flYRmv8r63/DtzeUT7c6ZThxmS6SDErPUj6w4J95fV mhQ84fjOnl0UJ9aRp2S245mBdPldl03VqIKRVIleDDMDfCn0gbLXpaK6ZzOJ0fnzxHKkELZHgmF M/Eo+Ve+gJxTfaV68dps2c8BazHR1Odoh/e41WLXs4anEN9/BjbceU+9ykZ5qShyZOc3Uwy6Yby 7sP58rjwjyBYB1/D9OaIjQKScQR4hnUe9DBMLNA1Wk X-Google-Smtp-Source: AGHT+IF5LB7zjNrRLkZ5eXQ1A6Lm7xHSr+oOpxBpiq+5BFOfT5pJDhYCz3rgr76zPso7ExfB4BpJ+Q== X-Received: by 2002:a17:906:730f:b0:afe:7b8c:a583 with SMTP id a640c23a62f3a-b647403a645mr3069948666b.13.1761227909653; Thu, 23 Oct 2025 06:58:29 -0700 (PDT) Received: from claudiu-X670E-Pro-RS.. ([82.78.167.151]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b6d511f8634sm226114066b.29.2025.10.23.06.58.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Oct 2025 06:58:28 -0700 (PDT) From: Claudiu X-Google-Original-From: Claudiu To: vkoul@kernel.org, kishon@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, p.zabel@pengutronix.de, geert+renesas@glider.be, magnus.damm@gmail.com, yoshihiro.shimoda.uh@renesas.com, biju.das.jz@bp.renesas.com Cc: claudiu.beznea@tuxon.dev, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Christophe JAILLET , Wolfram Sang , Claudiu Beznea Subject: [PATCH v8 2/7] phy: renesas: rcar-gen3-usb2: Fix an error handling path in rcar_gen3_phy_usb2_probe() Date: Thu, 23 Oct 2025 16:58:05 +0300 Message-ID: <20251023135810.1688415-3-claudiu.beznea.uj@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251023135810.1688415-1-claudiu.beznea.uj@bp.renesas.com> References: <20251023135810.1688415-1-claudiu.beznea.uj@bp.renesas.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" From: Christophe JAILLET If an error occurs after the reset_control_deassert(), reset_control_assert() must be called, as already done in the remove function. Use devm_add_action_or_reset() to add the missing call and simplify the .remove() function accordingly. While at it, drop struct rcar_gen3_chan::rstc as it is not used aymore. Fixes: 4eae16375357 ("phy: renesas: rcar-gen3-usb2: Add support to initiali= ze the bus") Signed-off-by: Christophe JAILLET Reviewed-by: Biju Das Reviewed-by: Geert Uytterhoeven Tested-by: Wolfram Sang [claudiu.beznea: removed "struct reset_control *rstc =3D data;" from rcar_gen3_reset_assert(), dropped struct rcar_gen3_chan::rstc] Signed-off-by: Claudiu Beznea --- Changes in v8: - none Changes in v7: - none Changes in v6: - dropped struct rcar_gen3_chan::rstc; updated the patch description to reflect it - collected tags Changes in v5: - none Changes in v4: - none Changes in v3: - collected tags Changes in v2: - none; this patch is new; re-spinned the Christophe's work at https://lore.kernel.org/all/TYCPR01MB113329930BA5E2149C9BE2A1986672@TYCPR= 01MB11332.jpnprd01.prod.outlook.com/ =20 drivers/phy/renesas/phy-rcar-gen3-usb2.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb2.c b/drivers/phy/renesas= /phy-rcar-gen3-usb2.c index 3f6b480e1092..a38ead7c8055 100644 --- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c +++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c @@ -134,7 +134,6 @@ struct rcar_gen3_chan { struct extcon_dev *extcon; struct rcar_gen3_phy rphys[NUM_OF_PHYS]; struct regulator *vbus; - struct reset_control *rstc; struct work_struct work; spinlock_t lock; /* protects access to hardware and driver data structure= . */ enum usb_dr_mode dr_mode; @@ -771,21 +770,31 @@ static enum usb_dr_mode rcar_gen3_get_dr_mode(struct = device_node *np) return candidate; } =20 +static void rcar_gen3_reset_assert(void *data) +{ + reset_control_assert(data); +} + static int rcar_gen3_phy_usb2_init_bus(struct rcar_gen3_chan *channel) { struct device *dev =3D channel->dev; + struct reset_control *rstc; int ret; u32 val; =20 - channel->rstc =3D devm_reset_control_array_get_shared(dev); - if (IS_ERR(channel->rstc)) - return PTR_ERR(channel->rstc); + rstc =3D devm_reset_control_array_get_shared(dev); + if (IS_ERR(rstc)) + return PTR_ERR(rstc); =20 ret =3D pm_runtime_resume_and_get(dev); if (ret) return ret; =20 - ret =3D reset_control_deassert(channel->rstc); + ret =3D reset_control_deassert(rstc); + if (ret) + goto rpm_put; + + ret =3D devm_add_action_or_reset(dev, rcar_gen3_reset_assert, rstc); if (ret) goto rpm_put; =20 @@ -924,7 +933,6 @@ static void rcar_gen3_phy_usb2_remove(struct platform_d= evice *pdev) if (channel->is_otg_channel) device_remove_file(&pdev->dev, &dev_attr_role); =20 - reset_control_assert(channel->rstc); pm_runtime_disable(&pdev->dev); }; =20 --=20 2.43.0