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 3CDBC1E5B97; Wed, 19 Mar 2025 14:38:45 +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=1742395125; cv=none; b=aiHd0QGnMyyY7TMceI+dEdInYcfW0PqJGh75ptJopfInqwlGHkcGp4PVbW9lTloItbdq/+qY+AqiC4BY9O9yOvLaKcdtR1/oqd4ApNKJ6PBswPP2EdYOj/1FVdG1lypy5tb3w7vkcFs6JvvVC/Gu0+Mr6ERyKAFC4VLNHNy+hjs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742395125; c=relaxed/simple; bh=GTV8lyNPHG3WWCO8Ed1sLChvUmiiac5vZw00a6P2Qvc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OtgIyf9Dcrvj7wrSOKem2FZbxTXtyL0v2NREGa3nKIGLFQwRPHAyT+ruk/hRMLpn0/dV/WcXRmQ9X/y93yzZUlMuCR2FyhwjskWzoFtk/M76Cyxdqlx7IpwapvpvbPynDH2Vjv55PR/n3Q2LdzWpo3+HazLminr0+cIr+XbTgVs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=iieHEkgt; 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="iieHEkgt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0B430C4CEE4; Wed, 19 Mar 2025 14:38:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1742395125; bh=GTV8lyNPHG3WWCO8Ed1sLChvUmiiac5vZw00a6P2Qvc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iieHEkgttCPmsTMOH6f2LHwyihTplCWdJYusJkqC40mOaCYCVSWxac2tqp2sE6k0e OR3GfhY3oDL4RyzZ1feKtEbq4/EGe67r5FJ6KGFmQe/wFZ9Ec0IXAAF20Cx2bU3dnd 8pc/+iLIJ9Nt7xns54nNfbAO0+9ZpOoJySqHltRc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Miguel Ojeda , Alice Ryhl , Jocelyn Falempe Subject: [PATCH 6.12 170/231] drm/panic: use `div_ceil` to clean Clippy warning Date: Wed, 19 Mar 2025 07:31:03 -0700 Message-ID: <20250319143031.044112464@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250319143026.865956961@linuxfoundation.org> References: <20250319143026.865956961@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Miguel Ojeda commit 986c2e9ca818b0b74cfc737517549fd0b80ff15d upstream. Starting with the upcoming Rust 1.86.0 (to be released 2025-04-03), Clippy warns: error: manually reimplementing `div_ceil` --> drivers/gpu/drm/drm_panic_qr.rs:548:26 | 548 | let pad_offset = (offset + 7) / 8; | ^^^^^^^^^^^^^^^^ help: consider using `.div_ceil()`: `offset.div_ceil(8)` | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#manual_div_ceil And similarly for `stride`. Thus apply the suggestion to both. The behavior (and thus codegen) is not exactly equivalent [1][2], since `div_ceil()` returns the right value for the values that currently would overflow. Link: https://github.com/rust-lang/rust-clippy/issues/14333 [1] Link: https://godbolt.org/z/dPq6nGnv3 [2] Signed-off-by: Miguel Ojeda Fixes: cb5164ac43d0 ("drm/panic: Add a QR code panic screen") Cc: stable@vger.kernel.org # Needed in 6.12.y and 6.13.y only (Rust is pinned in older LTSs). Reviewed-by: Alice Ryhl Reviewed-by: Jocelyn Falempe Signed-off-by: Jocelyn Falempe Link: https://patchwork.freedesktop.org/patch/msgid/20250301231602.917580-1-ojeda@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/drm_panic_qr.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_panic_qr.rs b/drivers/gpu/drm/drm_panic_qr.rs index ef2d490965ba..56692c6be219 100644 --- a/drivers/gpu/drm/drm_panic_qr.rs +++ b/drivers/gpu/drm/drm_panic_qr.rs @@ -545,7 +545,7 @@ impl EncodedMsg<'_> { } self.push(&mut offset, (MODE_STOP, 4)); - let pad_offset = (offset + 7) / 8; + let pad_offset = offset.div_ceil(8); for i in pad_offset..self.version.max_data() { self.data[i] = PADDING[(i & 1) ^ (pad_offset & 1)]; } @@ -659,7 +659,7 @@ struct QrImage<'a> { impl QrImage<'_> { fn new<'a, 'b>(em: &'b EncodedMsg<'b>, qrdata: &'a mut [u8]) -> QrImage<'a> { let width = em.version.width(); - let stride = (width + 7) / 8; + let stride = width.div_ceil(8); let data = qrdata; let mut qr_image = QrImage { -- 2.48.1