From nobody Sat Sep 10 07:01:03 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MPkKX094sz4cWhZ; Sat, 10 Sep 2022 07:01:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MPkKW6r0Vz3DVY; Sat, 10 Sep 2022 07:01:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662793264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s44USKt2Exxd294430UKct+lvC3HhfBkFEFPyJ4dLeY=; b=UtrDeI2hg64VMooradKgVO0dBXn8bbRrQRmruq0fyttbUPiCHq15b/ocW5dx6j+lS1TtHY zcWutePUsionrhbB2e6I/WZ9HhZETZcYDytxunxPG4MdYRyuMud4VfwxE0JPg2bUKQqBGy deuO7ZVFnAW5P5kvL0SYmtjgGUK/Vx+aRjz8g57RPq/X5Dpa0hZ/4knhDeyqKCuWLYnU9u nxCZZo2P3Mw3EdnHsrhhyEWAy16IXiemcHNdKNjcf1HpQ1umBx/lvTeiD4NdwQg8xlOG9x xjmkMLu9tF8i+KBS/iiRbZ9cqkzRp5JXqFL/J7b96vqvzqGFO62NY03VM0Zqkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MPkKW5vVMzDh0; Sat, 10 Sep 2022 07:01:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28A713oU076169; Sat, 10 Sep 2022 07:01:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28A713uc076168; Sat, 10 Sep 2022 07:01:03 GMT (envelope-from git) Date: Sat, 10 Sep 2022 07:01:03 GMT Message-Id: <202209100701.28A713uc076168@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: a2ad68ee9f4e - stable/12 - Revert "usb: Remove a double words in a source code comments" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: a2ad68ee9f4e74274faf30100d0048510817a079 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662793264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s44USKt2Exxd294430UKct+lvC3HhfBkFEFPyJ4dLeY=; b=C31l58FiyHxyGlvVUtUicsJIrlMcio82qzgNe8QZrAmTpcuc5mFJlcW0/TJahS1zVstb2G 4tNxZrmWZWrWLXncVRBzNKqbn8uxlcNJAzyIjZCj41SIAbDEu71jHmTj1+411WA9iJlLvr yNSOx1XVMVcfrqIDXZABfmQDADm8diGeTMsaFlqGR2RLvq6MmXAGK9BQLu4qIr+IUvtDpz yPiv0kqKwJuiRre+P/HI5CcFHT+ZgPsljHHMCILo6u8flfCm3raxTK+Aru5NGB50WW0vc3 wzeu5FFUq9U7uu2pxx1PuegaIQc06v6yC7wowFrR1caIFub2W08pxFPcoupn8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662793264; a=rsa-sha256; cv=none; b=OsrQMpDjVpCIDXG2Q/k2IdU2D0GmEmpl1n3Sb99AWWp8+v+17b/r44PSqinWZFSIf+dPfe YROaEBuoaQ3AdwBhoFQBaWeGnFxPIGiRYFD1qdWh34XKFLMDhLVIEloPsWRtRlj2/ZeH4y SWPC/ZHlW9R41r96JAgs5cPb+gIwIX/tvfS0p3pv7pxlSIBq3jRS1euPPfh+7J1RuU4aCv s8QiQx//ahIoNt2g0iLjHWFHJ/Ehn0ndWA2SBzbIda2zIWTZ9hPXI7YO9hdiE8KSqGBZRW YWsC6cYIPdwHnyhmwKYwAL03pbJpEFPenhu6XOFe9DZV83DiA1Z8VQ3s/76DgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gbe (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=a2ad68ee9f4e74274faf30100d0048510817a079 commit a2ad68ee9f4e74274faf30100d0048510817a079 Author: Gordon Bergling AuthorDate: 2022-09-04 15:40:25 +0000 Commit: Gordon Bergling CommitDate: 2022-09-10 07:00:24 +0000 Revert "usb: Remove a double words in a source code comments" This reverts commit 8ca67bf1273a5168f8a3787183159c477632e582. The original comment was correct; changing it loses a key part. Reported by: jrtc27 (cherry picked from commit 94466c432ed611a49cacae7ff99b224b37c906bb) --- sys/dev/usb/net/if_muge.c | 2 +- sys/dev/usb/net/if_smsc.c | 2 +- sys/dev/usb/usb_busdma.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/usb/net/if_muge.c b/sys/dev/usb/net/if_muge.c index 8b996643336f..359a167eaf02 100644 --- a/sys/dev/usb/net/if_muge.c +++ b/sys/dev/usb/net/if_muge.c @@ -1557,7 +1557,7 @@ muge_set_leds(struct usb_ether *ue) * @ue: the USB ethernet device * * This is where the chip is intialised for the first time. This is - * different from the muge_init() function in that one is designed to + * different from the muge_init() function in that that one is designed to * setup the H/W to match the UE settings and can be called after a reset. * */ diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c index f6317fe46160..b4a2e58dbd98 100644 --- a/sys/dev/usb/net/if_smsc.c +++ b/sys/dev/usb/net/if_smsc.c @@ -1574,7 +1574,7 @@ smsc_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) * @ue: the USB ethernet device * * This is where the chip is intialised for the first time. This is different - * from the smsc_init() function in that one is designed to setup the + * from the smsc_init() function in that that one is designed to setup the * H/W to match the UE settings and can be called after a reset. * * diff --git a/sys/dev/usb/usb_busdma.c b/sys/dev/usb/usb_busdma.c index 58d3d989a5d2..9df2b243d232 100644 --- a/sys/dev/usb/usb_busdma.c +++ b/sys/dev/usb/usb_busdma.c @@ -557,7 +557,7 @@ usb_pc_alloc_mem(struct usb_page_cache *pc, struct usb_page *pg, /* * XXX BUS-DMA workaround - FIXME later: * - * We assume that the alignment at this point of + * We assume that that the alignment at this point of * the code is greater than or equal to the size and * less than two times the size, so that if we double * the size, the size will be greater than the