From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2BCC71FC7 for ; Wed, 25 Feb 2026 01:49:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771984162; cv=none; b=PNMi+SsktZ8X8YEsAV6HnaRf7RNu1OQA9tvz3AUYs9Jb9zJyBX4V1mAVQH9oZraM4Pujz9SezMmWkxNREkN0tgGojML1U538IzKBWuTMbjFV+Nl4DAHc/Gq+maop7ApE+vV0VCJI5f2NBkQrEd6OzIyb4FjFjkR9RuWKz/nFUp4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771984162; c=relaxed/simple; bh=EctrzKK5fr39uEJPXD/ZJLo1TzWq0c8HBfDOaayGukk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tedTw7e7IsWZGdpkclGF8ocmMDLZobQ3UKs/vjMSUeOMPW2PLweWHy2I/mt6aJpgKH84evHDEr47Fn31kdKJXOCLauAcEaveZyx8IYKEClLpgpOdSj3sMtZ0PEvYg5bBjmKbnWofDprrBbCx5sKsQBQ2Ir9JxnZlXBI51KJdtMg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=k1vbqLzL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="k1vbqLzL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4320CC116D0; Wed, 25 Feb 2026 01:49:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1771984161; bh=EctrzKK5fr39uEJPXD/ZJLo1TzWq0c8HBfDOaayGukk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k1vbqLzLdQwo/eqL469POEP4LxbZguGDn4pr0CRW4Qod0y/5JsplhNxSrANxVW9aY NKffR70ur0f5MqaRLJj3uA9bDzG0jeYgAvKpP/AiH/LF5HH9l/nt/uUZ9oap6SIAoz 8e9SWkrlylQCx5yY0vZfEn2uxI0keC+gQkCXw2tu3Dznr11whzwSxTAYBL7slsxKa+ bTigsU/RLogireHYC9QMxv5qCVQQAEWGPP1K8y60JW89DV1e+PzuNXxH5i5xdyALNi GnEmnAm5zt5H517p7X0D+o27PtTIOgNNqkIDRdAwgD6JTTcynPkbgypdbqu3D0WfLk HdKr7kzXmuNbQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Hongyu Xie , Peter Chen , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH 6.12.y 1/3] usb: cdns3: remove redundant if branch Date: Tue, 24 Feb 2026 20:49:17 -0500 Message-ID: <20260225014919.3767757-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2026022420-straddle-unquote-c2f6@gregkh> References: <2026022420-straddle-unquote-c2f6@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Hongyu Xie [ Upstream commit dedab674428f8a99468a4864c067128ba9ea83a6 ] cdns->role_sw->dev->driver_data gets set in routines showing below, cdns_init sw_desc.driver_data = cdns; cdns->role_sw = usb_role_switch_register(dev, &sw_desc); dev_set_drvdata(&sw->dev, desc->driver_data); In cdns_resume, cdns->role = cdns_role_get(cdns->role_sw); //line redundant struct cdns *cdns = usb_role_switch_get_drvdata(sw); dev_get_drvdata(&sw->dev) return dev->driver_data return cdns->role; "line redundant" equals to, cdns->role = cdns->role; So fix this if branch. Signed-off-by: Hongyu Xie Acked-by: Peter Chen Link: https://lore.kernel.org/r/20241231013641.23908-1-xiehongyu1@kylinos.cn Signed-off-by: Greg Kroah-Hartman Stable-dep-of: 87e4b043b98a ("usb: cdns3: fix role switching during resume") Signed-off-by: Sasha Levin --- drivers/usb/cdns3/core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c index 465e9267b49c1..98980a23e1c22 100644 --- a/drivers/usb/cdns3/core.c +++ b/drivers/usb/cdns3/core.c @@ -529,9 +529,7 @@ int cdns_resume(struct cdns *cdns) int ret = 0; if (cdns_power_is_lost(cdns)) { - if (cdns->role_sw) { - cdns->role = cdns_role_get(cdns->role_sw); - } else { + if (!cdns->role_sw) { real_role = cdns_hw_role_state_machine(cdns); if (real_role != cdns->role) { ret = cdns_hw_role_switch(cdns); -- 2.51.0