Commit b4ac75a3 authored Oct 04, 2023 by Jakub Kicinski

Merge branch...

Merge branch 'fix-a-couple-recent-instances-of-wincompatible-function-pointer-types-strict-from-mode_get-implementations'

Nathan Chancellor says:

====================
Fix a couple recent instances of -Wincompatible-function-pointer-types-strict from ->mode_get() implementations

This series fixes a couple of instances of
-Wincompatible-function-pointer-types-strict that were introduced by a
recent series that added a new type of ops, struct dpll_device_ops,
along with implementations of the callback ->mode_get() that had a
mismatched mode type.

This warning is not currently enabled for any build but I am planning on
submitting a patch to add it to W=1 to prevent new instances of the
warning from popping up while we try and fix the existing instances in
other drivers.

This series is based on current net-next but if they need to go into
individual maintainer trees, please feel free to take the patches
individually.
====================

Link: https://lore.kernel.org/r/20231002-net-wifpts-dpll_mode_get-v1-0-a356a16413cf@kernel.org


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parents 78cac6f1 f4ecb3d4

drivers/net/ethernet/mellanox/mlx5/core/dpll.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -121,8 +121,8 @@ static int mlx5_dpll_device_lock_status_get(const struct dpll_device *dpll,
		}

		static int mlx5_dpll_device_mode_get(const struct dpll_device *dpll,
		void *priv,
		u32 mode, struct netlink_ext_ack extack)
		void priv, enum dpll_mode mode,
		struct netlink_ext_ack *extack)
		{
		*mode = DPLL_MODE_MANUAL;
		return 0;

drivers/ptp/ptp_ocp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4255,7 +4255,7 @@ static int ptp_ocp_dpll_state_get(const struct dpll_pin pin, void pin_priv,
		}

		static int ptp_ocp_dpll_mode_get(const struct dpll_device dpll, void priv,
		u32 mode, struct netlink_ext_ack extack)
		enum dpll_mode mode, struct netlink_ext_ack extack)
		{
		*mode = DPLL_MODE_AUTOMATIC;
		return 0;