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 4FDB02459D1; Mon, 13 Apr 2026 16:19:19 +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=1776097159; cv=none; b=XgG+AlxtwZbqm65wgpcWl/2WuO3wT2lO9oaKGOqoZ3ubbDMBCPNMsMtWG9kPN4tdl7V40MH0LbGmP04hRhJWNvM8ZFQFb4AH6wSuthWFwmXO5p5BKtohs3+SKNNDnFiafXSN/xY2GVNrbjS3+0l2OlMQojjekQ6+f0qEl2A8uTc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776097159; c=relaxed/simple; bh=z1hTyQyf1jPKvbqA0lxl/7yacPYhz8Hb0vjYyyvrCd8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mEfAl5MjllS0uZL74EJW7K9MQNtJApIFf8XVEPZ4a2B9K94ba2reQavcg6s1GZAuBiyUFnulP0/hCUBJKDMaXT6iZ+90q8FV9+0uppdbuTGb8x6kfnChJJYoHoAQpUgZbjqy8MGvYlaFuO0470BBefFhjPsuUW31DPACZwK4vDM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=X2KR77Eg; 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="X2KR77Eg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8010C2BCB0; Mon, 13 Apr 2026 16:19:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1776097159; bh=z1hTyQyf1jPKvbqA0lxl/7yacPYhz8Hb0vjYyyvrCd8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X2KR77Egj7/lbj/WTS5/6NwMCZ0+iczzNrD5+8CUVMfpgy+V5+JMr1QRy9z5nFzV3 EwjV1EASvhkS90X6WFjsoX06sS5W/16mAayl8ISjImQtlN4URNlbSKaUla0yIR4XDt 7nVRn44y+rbk9CXvGu4XHa6kCEGSpBJrVj9elGTQ= 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 5.15 029/570] usb: cdns3: remove redundant if branch Date: Mon, 13 Apr 2026 17:52:40 +0200 Message-ID: <20260413155831.515237560@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260413155830.386096114@linuxfoundation.org> References: <20260413155830.386096114@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-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 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