From b29cc3971e2657571e64ba9fac9e95c64ac2c600 Mon Sep 17 00:00:00 2001 From: Krishna Kurapati Date: Fri, 26 Apr 2024 10:35:12 +0530 Subject: [PATCH] UPSTREAM: usb: dwc3: core: Fix compile warning on s390 gcc in dwc3_get_phy call Recent commit introduced support for reading Multiport PHYs and while doing so iterated over an integer variable which runs from [0-254] in the worst case scenario. But S390 compiler treats it as a warning and complains that the integer write to string can go to 11 characters. Fix this by modifying iterator variable to u8. Bug: 254441685 Suggested-by: Johan Hovold Fixes: 30a46746ca5a ("usb: dwc3: core: Refactor PHY logic to support Multiport Controller") Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202404241215.Mib19Cu7-lkp@intel.com/ Signed-off-by: Krishna Kurapati Reviewed-by: Johan Hovold Link: https://lore.kernel.org/r/20240426050512.57384-1-quic_kriskura@quicinc.com Signed-off-by: Greg Kroah-Hartman (cherry picked from commit 3f12222a4bebeb13ce06ddecc1610ad32fa835dd) Signed-off-by: Lee Jones Change-Id: If11b5b866842a9e94edfdfcaa7c4aea1f575e0d2 --- drivers/usb/dwc3/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index b757fe1e5d96..1ec8522fc93d 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -1480,7 +1480,7 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) struct phy *temp_phy = NULL; char phy_name[9]; int ret; - int i; + u8 i; if (node) { dwc->usb2_phy = devm_usb_get_phy_by_phandle(dev, "usb-phy", 0); @@ -1510,7 +1510,7 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) if (vdwc->num_usb2_ports == 1) snprintf(phy_name, sizeof(phy_name), "usb2-phy"); else - snprintf(phy_name, sizeof(phy_name), "usb2-%d", i); + snprintf(phy_name, sizeof(phy_name), "usb2-%u", i); temp_phy = devm_phy_get(dev, phy_name); if (IS_ERR(temp_phy)) { @@ -1532,7 +1532,7 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) if (vdwc->num_usb3_ports == 1) snprintf(phy_name, sizeof(phy_name), "usb3-phy"); else - snprintf(phy_name, sizeof(phy_name), "usb3-%d", i); + snprintf(phy_name, sizeof(phy_name), "usb3-%u", i); temp_phy = devm_phy_get(dev, phy_name); if (IS_ERR(temp_phy)) {