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 10E9E39A805; Mon, 23 Mar 2026 14:55:10 +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=1774277710; cv=none; b=L7wqdIrDdqT+bldUX5vr7Q/PTVa691pMdh/LOj79t2adLVN9fnYGzH+R6blFbT7EZiqFqNBe70DCr8F2wl40tE2jXPIOQYDXIH0tdCwqD+TrTYKnMcz5bbz5dcjQNLVeUTd3DatCkA1l0dAN/4JKypiudi5v+/KkwsMp5Rag1PA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774277710; c=relaxed/simple; bh=LnKSh/AnwL4gSbeuTNhPVmq38eicAn0jqYoUhEUNWzE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qP14sSu6nSuAdnBXFIk1+5BzPDEcb1LNvmrFZ2JuC0VdS/IoSQqRwn5RJS57EJwBv8mAB1j3vJlachqC01wvJdxmklivUFm5jh7f/iZaYIU20NPCgPW0Ok18rXyMpLuEkZuygeigmeXybjcyoINFQoIcN1V91FVKv3R75U+NYHo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ly2RW3dL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ly2RW3dL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 934BCC4CEF7; Mon, 23 Mar 2026 14:55:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774277709; bh=LnKSh/AnwL4gSbeuTNhPVmq38eicAn0jqYoUhEUNWzE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ly2RW3dL8gsOuM9/XhsBsc6yPPLtfV/D16EGns7mTIImplVKLl8qFGYK88FtA4zOS cgdXUxULS4pgr8kzwPjzfV7Jr8iZrRTJIqgTOH3YZgpcTYNH5MjM1WmiILcIgtdwnj eA4Q5O8yLPoux3jgTiZtlp2rYpo0UAGxbe9YqO38= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Hongyu Xie , Peter Chen , Sasha Levin Subject: [PATCH 6.6 077/567] usb: cdns3: remove redundant if branch Date: Mon, 23 Mar 2026 14:39:57 +0100 Message-ID: <20260323134535.734239230@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260323134533.749096647@linuxfoundation.org> References: <20260323134533.749096647@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ 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