From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.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 E737F2FB610 for ; Sat, 18 Oct 2025 17:46:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760809569; cv=none; b=s/2treq6rkEJo04MWXY7dlKIhkOfHMYIdjWFRVb0R2V5viJveei/gKY1LCF/cQUu7L5ojLJmi3VSkUYEkdtThMLYRAY0jyNWLRZ7M2ZsYdHMfT1b419x8/HyFr0ozO7NgpH3nPxFBFSJeSzvLPk4d3bqz7ViYNGXWqLdff2imqE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760809569; c=relaxed/simple; bh=W0kd+lIKrES9E6f3i/NvYS4ZToF7HAzoNGFG8gcpmao=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ausf3qt44AJRBiqBuaL95/pThBaEJNbtehJGXArzBIEi+c4V977a2uv5nD+TVbc0OBTNoYEhdqCfHUFTMZaOqEezYP3ATXZ7rPU4Wg0+o05BU6DVBAsKON/SF5nNxuB6xRVij7NeDX7x8UQ/ruGgZSM4+ZYnvMAfCPNbEGVoGkU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=RJUsxV4m; arc=none smtp.client-ip=209.85.222.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RJUsxV4m" Received: by mail-qk1-f182.google.com with SMTP id af79cd13be357-8907af237ceso305816085a.3 for ; Sat, 18 Oct 2025 10:46:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760809567; x=1761414367; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=sKB2rh6EiQ7umDMD4HQ+ERdIpZM9C4N3KJVnDXEYlQU=; b=RJUsxV4mLUwfi6sZRhT1okEl38/H3LXxoSzmGRUT8wFxkDIqT6KLaOpXzDvKaFhKki O2GIKqKwV3f4hEubO2CcSR+6MfxlGoaecVmHqLXPifSwQFexHUsxFxjjH7YwlKyEOqqL q6zqZ85exfd3JY9hjeLRew1p9yCG7Z4vZQgBhRZi0RL6eLvGo11lHtBfPOour/xqaHgM wLs4NcTvki4J7cOMmt+guqWZQkVJuSaupB7fqaIkjq2E1aF7ylBaVAMoUvBtbVKeV0VP S8XkX0pta1l4dnNQkpid7fvULY07Fyr5PyHy78oZWxTBnWYmQwUhaMPeH/xQt3FYY217 kMVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760809567; x=1761414367; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sKB2rh6EiQ7umDMD4HQ+ERdIpZM9C4N3KJVnDXEYlQU=; b=HypiRJP/psGCBwIkHW0wktxZV7i4iiiKFSSBOUDNLgggQPl5veH23qUpa3pvAMT9us 7RG2FsyTKMu+M/yBy3XclFJxdbIEQA4ZUDocMLdMU3LHAldX/8uHntgAHtrF/ScIsV1R TeqKgsEMe7Do2AdcpVhIXZe4+H8F03800V9xSrzU2UwGfnkN5qTFnPit/Vrm6Y8u8xry 9Ammo8GNfHl2y2645G5E6LGiJoa8G4/Mhwn8dUj1qD6LNvSpd6YD38zqxv1q01ygBJ2b QEd8RHYskIGWR+lumv+SfqI7RVNh6nRqXjhKeCsvIrtbCc5jRqvNj62uZBzRqFNkargW bjog== X-Forwarded-Encrypted: i=1; AJvYcCUzov6QxNceKkieAOQRJ8zlKSVEg02n401CxlkVs4KwpLY8PEE8C4G8BBlXvWBTC915pt9uuknTSP8=@vger.kernel.org X-Gm-Message-State: AOJu0YzvNqE82XPHyL1RL5YQmj7xWYnxC3KbOGxwdKe+bu+l9EnT/EXJ h8LejaPysyllnJlcXN9MavYMuTwGSUegAHm7JSmCG4eU1lhUYsn2A/9x X-Gm-Gg: ASbGncs9cVsC+zKVkI0nNiBFDs8wcgmWahFcIqLCjgymyXt1S3/Llncr4W0dp4SIWJf CYomPheKNTfk9NRS04/geEI4nE2cxpyL5tfYbckTMYeBEym0w32Ncn84ue8FkYaUSR+613WbJFM ZZqFa9IjDgvbfuGBFOiR+CSCnMgsPZGhVqy2Pt3VCFjgkybegrG2MnuZcc7frA/qtzUO0Z5rBND 7eiRttmQ8by/4Gd+GN6LYiwChaQKfNE0zSHm00WNhCt84ZRbzR4FVoETVl2ZTCIXqtvBEoNOgYY ZZZ2Lx9Dn6ItQLziMRmtlVZhvnHvBI5WgWajIFqg4po8ozLx9BzRkS7E4BPkHbzsv6GGD+yXDQh DpWRnzpVzoV67pN+SqWdxkf/yeCr9+MNHGfCqPu+ydqdlrdvfOlByfi7YeFFlgG9r0L5KOaMb1k g+o9We5htldYjBCs1Cm1aT8tm4w3ji80RTGr/QrhHBViV8dOuSqDr2krzUGHU/zG7dcyUIKd9MY px+1wDP3GJV9v3U6gebjVYHNXmC8Xw8H6DU9crOnyJ4VSKSeCnX81pN7e8FJgM= X-Google-Smtp-Source: AGHT+IEi+T9/sjZ3+qvtuzBCO8Ryg37IjVdgJ7+/CPsrCZub5GHtmSQZv61we6wEcfm1jaszdnCtzA== X-Received: by 2002:ac8:5908:0:b0:4e8:8e75:1875 with SMTP id d75a77b69052e-4e89d283973mr96538081cf.23.1760809566774; Sat, 18 Oct 2025 10:46:06 -0700 (PDT) Received: from 117.1.168.192.in-addr.arpa ([2600:4808:6353:5c00:1948:1052:f1e9:e23a]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4e8ab114132sm20445161cf.40.2025.10.18.10.46.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Oct 2025 10:46:06 -0700 (PDT) From: Tamir Duberstein Date: Sat, 18 Oct 2025 13:45:21 -0400 Subject: [PATCH v18 10/16] rust: opp: use `CStr::as_char_ptr` Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251018-cstr-core-v18-10-ef3d02760804@gmail.com> References: <20251018-cstr-core-v18-0-ef3d02760804@gmail.com> In-Reply-To: <20251018-cstr-core-v18-0-ef3d02760804@gmail.com> To: 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 , Greg Kroah-Hartman , "Rafael J. Wysocki" , Luis Chamberlain , Russ Weight , Peter Zijlstra , Ingo Molnar , Will Deacon , Waiman Long , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Christian Brauner , Alexander Viro , Jan Kara , =?utf-8?q?Arve_Hj=C3=B8nnev=C3=A5g?= , Todd Kjos , Martijn Coenen , Joel Fernandes , Carlos Llamas , Suren Baghdasaryan , Jens Axboe , Lorenzo Stoakes , Vlastimil Babka , "Liam R. Howlett" , Uladzislau Rezki , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Viresh Kumar , Nishanth Menon , Stephen Boyd , Breno Leitao , Liam Girdwood , Mark Brown , Michael Turquette , David Airlie , Simona Vetter Cc: rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-pci@vger.kernel.org, linux-pm@vger.kernel.org, linux-clk@vger.kernel.org, dri-devel@lists.freedesktop.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1760809527; l=1431; i=tamird@gmail.com; h=from:subject:message-id; bh=W0kd+lIKrES9E6f3i/NvYS4ZToF7HAzoNGFG8gcpmao=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QEAqWyd54iXxQf1W7agZsuXCPqrg/zEyTWXe5pjUlem4d91+xriJLoSF0e5Up8mkLDTG1Mc0sF9 CNvCQrLokrQ8= X-Developer-Key: i=tamird@gmail.com; a=openssh; fpr=SHA256:264rPmnnrb+ERkS7DDS3tuwqcJss/zevJRzoylqMsbc Replace the use of `as_ptr` which works through `::deref()` in preparation for replacing `kernel::str::CStr` with `core::ffi::CStr` as the latter does not implement `Deref`. Signed-off-by: Tamir Duberstein --- rust/kernel/opp.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rust/kernel/opp.rs b/rust/kernel/opp.rs index 2c763fa9276d..9d6c58178a6f 100644 --- a/rust/kernel/opp.rs +++ b/rust/kernel/opp.rs @@ -13,7 +13,7 @@ cpumask::{Cpumask, CpumaskVar}, device::Device, error::{code::*, from_err_ptr, from_result, to_result, Result, VTABLE_DEFAULT_ERROR}, - ffi::c_ulong, + ffi::{c_char, c_ulong}, prelude::*, str::CString, sync::aref::{ARef, AlwaysRefCounted}, @@ -88,12 +88,12 @@ fn drop(&mut self) { use macros::vtable; /// Creates a null-terminated slice of pointers to [`Cstring`]s. -fn to_c_str_array(names: &[CString]) -> Result> { +fn to_c_str_array(names: &[CString]) -> Result> { // Allocated a null-terminated vector of pointers. let mut list = KVec::with_capacity(names.len() + 1, GFP_KERNEL)?; for name in names.iter() { - list.push(name.as_ptr().cast(), GFP_KERNEL)?; + list.push(name.as_char_ptr(), GFP_KERNEL)?; } list.push(ptr::null(), GFP_KERNEL)?; -- 2.51.1