From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 13 Apr 2026 21:52:02 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wCNKE-00BpMD-2E for lore@lore.pengutronix.de; Mon, 13 Apr 2026 21:52:02 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1wCNKE-0007mY-5p for lore@pengutronix.de; Mon, 13 Apr 2026 21:52:02 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:To:From:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=4YUgICDNO1+4cQmM0CBLp68OIgpUI42r1SUAjHvmpvY=; b=e1UPDQakCWsnAidJACdtkZkOGQ rFnGGgb24nvFOQHhJ/OvebFtnWvL2X82UOLZczMQXbrutw+F4umFLXPXRbLj7m3buaxBoKT8skfcw PJiKCDOYtCAE7Hvnyt5guDM6f9aQYKR3M5Mnw8SEtSJgxfiPh95HjLXPbpYCvrFcKjVkzFuvmUJY/ tkcCWN54P1VD4xyETIU1Bn59P/qlw2sOmo4Ss+Hys8nf4SyjqVmDECGh5vx6gQ8zTQbmj0vjVIE9J 17ou0p19R1KIsD/H/aqNddjh/O6rjbkM/VT2Q1m9WENLJLSO2Ro2FWzjOchcM7btvVFLROJKKeskG VaKne4qA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1wCNJh-0000000GKQA-3Xc7; Mon, 13 Apr 2026 19:51:29 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1wCNJf-0000000GKPq-1xi1 for barebox@lists.infradead.org; Mon, 13 Apr 2026 19:51:28 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1wCNJd-0007i9-Th; Mon, 13 Apr 2026 21:51:25 +0200 Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wCNJd-005Dur-2M; Mon, 13 Apr 2026 21:51:25 +0200 Received: from [::1] (helo=dude02.red.stw.pengutronix.de) by dude02.red.stw.pengutronix.de with esmtp (Exim 4.98.2) (envelope-from ) id 1wCNJd-0000000CD7T-2aAd; Mon, 13 Apr 2026 21:51:25 +0200 From: Sascha Hauer To: Barebox List Date: Mon, 13 Apr 2026 21:51:24 +0200 Message-ID: <20260413195124.2910057-1-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260413_125127_501295_C77B3301 X-CRM114-Status: UNSURE ( 9.25 ) X-CRM114-Notice: Please train this message. X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.2 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH] usb: gadget: Use put_unaligned_le16() from asm/unaligned.h X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) usbstring.c has its own put_unaligned_le16() function instead of using the existing one from asm/unaligned.h. This was never a problem, but since 87d3ae4bee ("filetype: fix unaligned access for x86_linux_bootimage") the conflicting definition from asm/unaligned.h leaks in which results in a failed build. Drop the duplicate function and explicitly include the correct definition. Signed-off-by: Sascha Hauer --- drivers/usb/gadget/usbstring.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/usb/gadget/usbstring.c b/drivers/usb/gadget/usbstring.c index 58eb28ad1a..209a3d01d8 100644 --- a/drivers/usb/gadget/usbstring.c +++ b/drivers/usb/gadget/usbstring.c @@ -8,12 +8,7 @@ #include #include - -static inline void put_unaligned_le16(u16 val, u8 *p) -{ - *p++ = val; - *p++ = val >> 8; -} +#include static int utf8_to_utf16le(const char *s, __le16 *cp, unsigned len) { -- 2.47.3