From patchwork Sun Mar 16 06:14:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Hickey X-Patchwork-Id: 14018359 Received: from mail-yb1-f182.google.com (mail-yb1-f182.google.com [209.85.219.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9066F18FC8F for ; Sun, 16 Mar 2025 06:20:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742106040; cv=none; b=iO4YVNRzSvCoGqZmKtSwg004MGTVTbIl12fzvy6stYwgc65c6NaYR80SX1hwfiYTKqAZjPpqkgjgD8eyWd7ud05r5FDKDzML0Ze98cy1Xn63utJQRERVnVRT/L2cQeEqmJAZWFwlvEI+CxohyNiq7Q09n+rqKoUAKxJY5qvm9yg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742106040; c=relaxed/simple; bh=gySnbe+vLzB7F5mNzeA75V93oZYKI+9q9RIAFvjms8o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EGkCes1eycoDujKQMLVZBbT7gQye2/fyOLK5FELBssDuX2PSBktwjB6JoDu4eiXZlWGPM3yZjABYKyhJUmEtVHY99pIO0kO4czZGLb9ikbRS3MAtyW9T8Bz96bGoAwz4oFJVQvqLNGGCkz4PfGXnA+F/qM85UoJb4+N/SHcrcd0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=byte-forge.io; spf=pass smtp.mailfrom=byte-forge.io; dkim=pass (2048-bit key) header.d=byte-forge-io.20230601.gappssmtp.com header.i=@byte-forge-io.20230601.gappssmtp.com header.b=zqSN2CBP; arc=none smtp.client-ip=209.85.219.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=byte-forge.io Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=byte-forge.io Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=byte-forge-io.20230601.gappssmtp.com header.i=@byte-forge-io.20230601.gappssmtp.com header.b="zqSN2CBP" Received: by mail-yb1-f182.google.com with SMTP id 3f1490d57ef6-e4930eca0d4so2701518276.3 for ; Sat, 15 Mar 2025 23:20:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=byte-forge-io.20230601.gappssmtp.com; s=20230601; t=1742106037; x=1742710837; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dx2EcOXIxEZHQL9BVCXmu7GqocKqlrDTrKJRW1T6D0Y=; b=zqSN2CBPYsw22cJTE4KuD+MTAZRZZkX1ijMw4IQPJMM+vX7q1NhUl7qe/tXez3Etdv ILfBzMaoprc3kWDofuqmGNYnDRn2Ov1tJdvQLEFSTvdcQt84Jnj56HgXAt9gzGfyY0Du Ki8kRplJgrpGrjEJorh4MpHpnj/4boLXubLE4xuCBykDfLmPHP91kno+lLHxg6KZBatW pzoLYb1+P0EHNPvQHklQTW/hYmIbT8Pyhb1B46Kf8166UuFIk8v7hss4k7qUTLzR1QqM XS0qzIITSpePStLQiImumodMWl0Ni0e/gZV8vNY2xnHrjQ+0iKUu8RosgeBnuU30zFLr UaAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742106037; x=1742710837; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dx2EcOXIxEZHQL9BVCXmu7GqocKqlrDTrKJRW1T6D0Y=; b=RlP9W2bfvBHiu2dtb4PL2mdgOsHqVh6P575c1ytDeWAL/j1OOVQvn5He1zFo9Bbyj9 DBZ8JCcOISB74Ep7E/s1V4FJV+9Obfj97NVwONMK7SkBUbiOcrBrK8wRttzxLJji7ljG foLJdek6UeWIXMMbdtPTdNYgDeNYD/SzNbu9QK5BOFi1/rxYOPFVWj8rDQIwEkC1ctrT KKrJ8DYB2LuFnrHKqHhgHO+1lrFKorjtwzXmGw515gQWP4Po88HSIDf7V49B0Of6SHCU ny5nV+jfMx0hK8jfLxTJARzpLG+Sq4IligZwEXDRkkgFvMARnA7DJO96yFJb1xhbyorM ZWwg== X-Forwarded-Encrypted: i=1; AJvYcCWCwqldviZ8FBekOvajRcT4gF67oM0u24IYO6F3vmkLRD72pdnO1coRt0I69XyZ/CkIzbzMAjISnms=@vger.kernel.org X-Gm-Message-State: AOJu0Yy3pJphU6x2H2KLkB/nT1qF6Peej/2Nne/rxGOLyzwMpf6mIB/8 P4eNmvt8TRGM41yBbQVYcvGj9tdMig3irWmvs5MTZ9yD+riBj6lwbBL/cMEKTxk= X-Gm-Gg: ASbGncseiyM2stPPdqVe2SaC+6WqXf1XXdDq4zrh1S9b7N2POM3tl06bPSbyiASvENh FrhBfXgOskjKiosAfhQdAuYtj20DP3b8aKl0OKBdcaAxXjrJz6VnPVQSqMRH/X21y89LQfskFnh sItPOj8b/Fh7XR35OHHi26FxEjc5/tO8nFmzlH/l650fnOJNywxqF8oG47OHknxdGyy1W3X0FXp 6N8IkagdnqvNHixWmQEcPWD5+9Jikw3Bfwyma0G9hfz1tRNFNozEsqYcu+UhUF4XGPmMC23SDrp v/ms10mOTjAFmFmddqsxeYgqEfT4Yn/5BeZGEcw1TcBPcBuQ8OMGsFR8Pk7zaGN+OwqA6HN3IX3 222f33doGk0fg9YBNLMKFSuPDEn/APw== X-Google-Smtp-Source: AGHT+IFnrHoT6XIuxtLq9jDo1MLrNzQ6L46U5f7kPuzqx8EI+Sypu2OuNNUq1wE4WEO3Y7c9ZHNJdA== X-Received: by 2002:a05:6902:1a4a:b0:e63:edcc:edcd with SMTP id 3f1490d57ef6-e63f65c4e12mr9676199276.34.1742106037568; Sat, 15 Mar 2025 23:20:37 -0700 (PDT) Received: from Machine.lan (107-219-75-226.lightspeed.wepbfl.sbcglobal.net. [107.219.75.226]) by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e63e53fd277sm1618673276.11.2025.03.15.23.20.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Mar 2025 23:20:37 -0700 (PDT) From: Antonio Hickey X-Google-Original-From: Antonio Hickey To: Bjorn Helgaas , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich Cc: Antonio Hickey , linux-pci@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 07/16] rust: pci: refactor to use `&raw [const|mut]` Date: Sun, 16 Mar 2025 02:14:16 -0400 Message-ID: <20250316061429.817126-8-contact@antoniohickey.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250316061429.817126-1-contact@antoniohickey.com> References: <20250316061429.817126-1-contact@antoniohickey.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Replacing all occurrences of `addr_of!(place)` and `addr_of_mut!(place)` with `&raw const place` and `&raw mut place` respectively. This will allow us to reduce macro complexity, and improve consistency with existing reference syntax as `&raw const`, `&raw mut` are similar to `&`, `&mut` making it fit more naturally with other existing code. Suggested-by: Benno Lossin Link: https://github.com/Rust-for-Linux/linux/issues/1148 Signed-off-by: Antonio Hickey --- rust/kernel/pci.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust/kernel/pci.rs b/rust/kernel/pci.rs index f7b2743828ae..6cb9ed1e7cbf 100644 --- a/rust/kernel/pci.rs +++ b/rust/kernel/pci.rs @@ -17,7 +17,7 @@ types::{ARef, ForeignOwnable, Opaque}, ThisModule, }; -use core::{ops::Deref, ptr::addr_of_mut}; +use core::ops::Deref; use kernel::prelude::*; /// An adapter for the registration of PCI drivers. @@ -60,7 +60,7 @@ extern "C" fn probe_callback( ) -> kernel::ffi::c_int { // SAFETY: The PCI bus only ever calls the probe callback with a valid pointer to a // `struct pci_dev`. - let dev = unsafe { device::Device::get_device(addr_of_mut!((*pdev).dev)) }; + let dev = unsafe { device::Device::get_device(&raw mut (*pdev).dev) }; // SAFETY: `dev` is guaranteed to be embedded in a valid `struct pci_dev` by the call // above. let mut pdev = unsafe { Device::from_dev(dev) };