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 E83AF1FE45A for ; Wed, 25 Feb 2026 02:11:55 +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=1771985516; cv=none; b=pgYOqXNG9/wLDhzqBcfueSqrSw5GLEbi9PtkQ0Gg2+t+MEN0ykRRrzHTn32awCtPfUecrbZA7omKdI6znALcK2K85B5vRj+7Sv3nL6jt5OlrJJeIrDgmjB7GNFfRdaTv2UAhDK68u5jMU1SWZSHhPeyFf1uy9SoAKQ2vXaqFw3M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771985516; c=relaxed/simple; bh=EZq2tgEGbvnHjpjQmnQx4cNWLpbIiyprQMkgBL30Ls0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nebulv/UerRZEtJOtK9zR+hsSMV0vGekhEbg0ePnXiQSCHrLpH4ankb+HdqOuzMu7oYMEDBt4tTrYC8DNSnjkPxwQdgz/8YToztAMCBEgWB7kzu1g8LSdkz9sBkBnaBJW4ClhPdMwMKYsJS1KBEmAaCd2EMFfvIFuZ2MhkQ8qSk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=k6V56tVH; 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="k6V56tVH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DED6CC116D0; Wed, 25 Feb 2026 02:11:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1771985515; bh=EZq2tgEGbvnHjpjQmnQx4cNWLpbIiyprQMkgBL30Ls0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k6V56tVH/xJ5pyTDpA83DBSLnqdL6F0kJUhq7P6kk0+B8mIOOxGIhJqmVxc4rt+B+ nOzN2A/bSQ9pIFveLGX1+uP9uoysIa1m0ufLSo8fl9EjKgZP0CXZTsHJ9gCdtRRsxG wQ7tseB6dPevaezfetrsEQcqOoMRwdIorQD1zoy/9FZJ4i5S4wSB5MApNp5J9iIO3T m8yw6UsWV/HyNe0P3b22bbJ7wkB0Af1ZQout7sC/INGcufBKEopXslD6kFKWcBFTVs nAHMHN5fh8ffJE+TAe+hL7T2e7WPsdl123BYOUo0hJnj+r8f5wFTh2Gmsy5fjJcGPe ShewTPAIRbO1A== From: Sasha Levin To: stable@vger.kernel.org Cc: Hongyu Xie , Peter Chen , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH 6.1.y 1/3] usb: cdns3: remove redundant if branch Date: Tue, 24 Feb 2026 21:11:51 -0500 Message-ID: <20260225021153.3792372-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2026022423-embody-numerator-bbf2@gregkh> References: <2026022423-embody-numerator-bbf2@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 7242591b346bc..d272d7b82bec1 100644 --- a/drivers/usb/cdns3/core.c +++ b/drivers/usb/cdns3/core.c @@ -528,9 +528,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