From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.214.182 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794911796; b=kv3mlV6gEnVCcGnW5wf2AmdFm9O8VOKu6BhNZVX6Ky8svQRkDBEyIQQOFxGUK12I3U2m 1EVKwjCW41njpskkf61jPdbAfa6thzSDQQkYXI8DFB5Sl5yH4ilZoS5+VGy41SKzGOs+8 HODqpKZuUnxF8PN0DmSYUMUvbLgnpgjOx0Wwv77MIxEaqcsQ+7t28EBKo/MNbKzCDiU+8 43xPt6hRfaZX3En/B+dOVeZ39c8XcbqwUTf6OQbfJ8TPy2jU/9h1XLkUuX1gXwqnX6goa glkhPbsibcJsoN6kTREB+jSF3VPGhvzD6E+mOLSix4PP569raeSErSxS3Th6ILWyVtQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794911796; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:Date:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding: Message-Id:References:In-Reply-To:To:Cc:X-Mailer; bh=qZNTBoTcS5DBWk9MrSUVIyuui63DwibuwP67YeoekqA=; b=rHr93YtKhURIh4qNC0bAXUCuLDuLRjy0ocNlC8wM7JOgJo17paDK9u/cdQ29ISYzf3sN lioVWsd9QmgQQeZX85OpCRp4DYmmJf/il0m2pOv2M9ZCelX21zC8CEUuCKCxf+s38TfaB K62/alM0kTqJtEcBGKbMFS2QxfOKRyNKG7l2iwqq9MGGhqWEyVvVR6ycXw69Rsn7yzkKn guh411qSRgkSfvNAlL0+AiGjo+vpDinZCk5A4k54C87PZxSomhIRkaQQIjY6m2lyxRhgk /id8KIWKSXPU5E0a3Gt1b6IWf6ezZkcaOuoqP1I5XAhGFskkUwUVR5xLKm5s3bmJApQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b="mMSZTlR/"; arc=none smtp.remote-ip=209.85.214.182 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4FF09606A330 for ; Tue, 17 Nov 2026 10:36:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 4FF09606A330 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.a=rsa-sha256 header.s=20260707 header.b=mMSZTlR/ Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2e96502e447so44894425ad.1 for ; Tue, 17 Nov 2026 02:36:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794911795; x=1795516595; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=qZNTBoTcS5DBWk9MrSUVIyuui63DwibuwP67YeoekqA=; b=mMSZTlR/CC9DhBjsbWp2CdMrIuwQR+QeOA1T2utv9cc8U4/Lss0dk6Qe/qW5DnIPSd fNbzVlvQ7ys1Bmg8gMcrphDIZZReZMZ4oXzyRyQctDSX9+51plSTAj0AlximVuQUPOCS 3JZ0aQlSymrIsJIZr/llhpNEfYP4p5nJKrgw4wGqpsJ5cTVRUALxhlEWKIA77GcD/t6b OhYz94YBUB8X9z7UXx+bpxkzo63NOKVUqdl/KG/aGBoDk3vNfaRZH6AJTjCKVPwpKyl5 jYa7vZ7TY9mlCIEldPNW/e1xEcu87E5xg5hmXdf5fzGqCH8YjShQYUtobirU3A1WzUku D18w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794911795; x=1795516595; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=qZNTBoTcS5DBWk9MrSUVIyuui63DwibuwP67YeoekqA=; b=U1/H3sx4SrCU6kkYdWpwaFAVSufJLW0kQmWRWD/KekZW9LgG3sD1j5ZBMGwXZCgw/t k8fPaIGobsmD9b+Q5z5tFrivnc71CatlSdp9g9x7tCCeAxl61pZFJZonnIQxx/4KfIqf lKFqiOVjquNipyxiVfL6dloJgKPTcBbbavAULCAbZpSmvGaSMjl7BkQ4NARR3B0QUdx7 1PYtMJkIoSSfMhKl3YBxQJwj1lFwN41ZZs5r4NwZnk4nsbZRmTAYtYb4seQhh+EAnstN aem0S3Mou7FpOxe8BOVFThj7S2C0pkIcTGmyw7KvYxCwOJpeArOabxTvnYFnh8KcTMkI 6fnQ== X-Forwarded-Encrypted: i=1; AL+hErGBMNNI83hN0AmH69jYfuksm2XG52a/O2i9AnRJ4GxHj7qUJjqTpKR6HfZP2wyXc5xYrmOWj1Eoi2N6RZ8=@vger.kernel.org X-Gm-Message-State: APuU4Z9Bd4j+OfLYOjmVicL0JDSoRytT/W/DVFVuIXd8b7z9qzSpjZX4 +6fNYm+Tt6hMnX8tCCoSNaVVyzDTCyJIvGwrl6sUPA7/g2F3a89R5MsW X-Gm-Gg: AZFdTZchTO47liTBoQVU6BHT5aC2Rwi7yeo+PvxGyQE0bO7yBLwpGAaWy1WNyCZYQ57 iXKTqPQ7qUYmG99Xaygdetbhi1AxNojMSjdeHuATu8jVvvKSSEvhehoI2cmaCDB7OvtHQh84DQl dlDw6zT/mnYO8r1qFHQNIQ8w25znnFQqsZedrP+qrSuhJvvV6QaCz1gXFLT6k6V6bGI9XmE+dWa nx5SgbmcZ/Cspq4n9YHYx66rio+QNcgoerjMSfQX79IwKMPw/l35/6/VmIASEQm187XoPDuECZ2 SmXHtZGhNYRsBE8wWdKMubrhi85WruaJCf3E+QCQlLxIkL0Lh0jWU7WneDg0hnrrsA8TfS5THWz lnglbH9Jsy0hnP8Wsv/Oa/0ZcYPxFIzqKFZc/XeGBPRL38zobVWrGz+MIwabqFh/8pwAwLuuCaR Ns0NvEr3HtNjN4AwEcD70DLe2XPpK1gVukUhjHi38sXT0T5UQJSj7EzSrzK89JIPV7QYf5Wwihg 0ebGjwYlL8jPfZv15R4+w3Ip6+Kw6+mbqyYbHf5FoJ3EiVEvlcs8WD4JBf8D+FB1+btrn7lgqUM quEA4ODNw2BALltFgJpUb5uCyMd1M/WTemTHF9OAWEvBFIcP0r8bq+GvZVPIO/WJUnD+XV0IaQU zzEtx1OkdNL2Z+hEnN+AJYxTYAS/AgRhxkmTVFU7Z6/GxNlWQJGm3Fy2buWG59DANL4JpXSD6iL LqUw== X-Received: by 2002:a17:902:db09:b0:2e2:c995:b00a with SMTP id d9443c01a7336-2ee0dcc3039mr136039595ad.48.1794911794627; Tue, 17 Nov 2026 02:36:34 -0800 (PST) Received: from [169.254.3.1] ([143.248.188.96]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2efd76d8f08sm13094805ad.4.2026.11.17.02.36.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2026 02:36:34 -0800 (PST) From: SeungJong Ha Date: Tue, 17 Nov 2026 19:36:19 +0900 Subject: [PATCH net-next v3 1/3] rust: net: phy: drop unused read_mmd, write_mmd and match_phy_device X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261117-exp-phy-rs-maybelocked-v3-1-4e183a7366a7@gmail.com> References: <20261117-exp-phy-rs-maybelocked-v3-0-4e183a7366a7@gmail.com> In-Reply-To: <20261117-exp-phy-rs-maybelocked-v3-0-4e183a7366a7@gmail.com> To: FUJITA Tomonori , Trevor Gross , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Miguel Ojeda , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Danilo Krummrich , Daniel Almeida , Tamir Duberstein , Alexandre Courbot , =?utf-8?q?Onur_=C3=96zkan?= , Andrew Lunn , Heiner Kallweit , Russell King Cc: netdev@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, SeungJong Ha X-Mailer: b4 0.15.2 No Rust PHY driver implements read_mmd, write_mmd or match_phy_device, and none has since they were added. They would also get a `Device` that assumes `phy_device->lock` is held, but read_mmd and write_mmd run under the MDIO bus lock, and match_phy_device runs without any PHY lock. Drop them until there is a user. Signed-off-by: SeungJong Ha --- rust/kernel/net/phy.rs | 83 -------------------------------------------------- 1 file changed, 83 deletions(-) diff --git a/rust/kernel/net/phy.rs b/rust/kernel/net/phy.rs index c4e7b1d6c6f4..4604a9c0a511 100644 --- a/rust/kernel/net/phy.rs +++ b/rust/kernel/net/phy.rs @@ -403,58 +403,6 @@ impl Adapter { }) } - /// # Safety - /// - /// `phydev` must be passed by the corresponding callback in `phy_driver`. - unsafe extern "C" fn match_phy_device_callback( - phydev: *mut bindings::phy_device, - _phydrv: *const bindings::phy_driver, - ) -> c_int { - // SAFETY: This callback is called only in contexts - // where we hold `phy_device->lock`, so the accessors on - // `Device` are okay to call. - let dev = unsafe { Device::from_raw(phydev) }; - T::match_phy_device(dev).into() - } - - /// # Safety - /// - /// `phydev` must be passed by the corresponding callback in `phy_driver`. - unsafe extern "C" fn read_mmd_callback( - phydev: *mut bindings::phy_device, - devnum: i32, - regnum: u16, - ) -> i32 { - from_result(|| { - // SAFETY: This callback is called only in contexts - // where we hold `phy_device->lock`, so the accessors on - // `Device` are okay to call. - let dev = unsafe { Device::from_raw(phydev) }; - // CAST: the C side verifies devnum < 32. - let ret = T::read_mmd(dev, devnum as u8, regnum)?; - Ok(ret.into()) - }) - } - - /// # Safety - /// - /// `phydev` must be passed by the corresponding callback in `phy_driver`. - unsafe extern "C" fn write_mmd_callback( - phydev: *mut bindings::phy_device, - devnum: i32, - regnum: u16, - val: u16, - ) -> i32 { - from_result(|| { - // SAFETY: This callback is called only in contexts - // where we hold `phy_device->lock`, so the accessors on - // `Device` are okay to call. - let dev = unsafe { Device::from_raw(phydev) }; - T::write_mmd(dev, devnum as u8, regnum, val)?; - Ok(0) - }) - } - /// # Safety /// /// `phydev` must be passed by the corresponding callback in `phy_driver`. @@ -511,11 +459,6 @@ pub const fn create_phy_driver() -> DriverVTable { } else { None }, - match_phy_device: if T::HAS_MATCH_PHY_DEVICE { - Some(Adapter::::match_phy_device_callback) - } else { - None - }, suspend: if T::HAS_SUSPEND { Some(Adapter::::suspend_callback) } else { @@ -536,16 +479,6 @@ pub const fn create_phy_driver() -> DriverVTable { } else { None }, - read_mmd: if T::HAS_READ_MMD { - Some(Adapter::::read_mmd_callback) - } else { - None - }, - write_mmd: if T::HAS_WRITE_MMD { - Some(Adapter::::write_mmd_callback) - } else { - None - }, link_change_notify: if T::HAS_LINK_CHANGE_NOTIFY { Some(Adapter::::link_change_notify_callback) } else { @@ -588,12 +521,6 @@ fn get_features(_dev: &mut Device) -> Result { build_error!(VTABLE_DEFAULT_ERROR) } - /// Returns true if this is a suitable driver for the given phydev. - /// If not implemented, matching is based on [`Driver::PHY_DEVICE_ID`]. - fn match_phy_device(_dev: &Device) -> bool { - false - } - /// Configures the advertisement and resets auto-negotiation /// if auto-negotiation is enabled. fn config_aneg(_dev: &mut Device) -> Result { @@ -615,16 +542,6 @@ fn resume(_dev: &mut Device) -> Result { build_error!(VTABLE_DEFAULT_ERROR) } - /// Overrides the default MMD read function for reading a MMD register. - fn read_mmd(_dev: &mut Device, _devnum: u8, _regnum: u16) -> Result { - build_error!(VTABLE_DEFAULT_ERROR) - } - - /// Overrides the default MMD write function for writing a MMD register. - fn write_mmd(_dev: &mut Device, _devnum: u8, _regnum: u16, _val: u16) -> Result { - build_error!(VTABLE_DEFAULT_ERROR) - } - /// Callback for notification of link change. fn link_change_notify(_dev: &mut Device) {} } -- 2.54.0