Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efee95f4 authored Sep 20, 2016 by Nicolas Pitre Committed by David S. Miller Sep 22, 2016

ptp_clock: future-proofing drivers against PTP subsystem becoming optional



Drivers must be ready to accept NULL from ptp_clock_register() if the
PTP clock subsystem is configured out.

This patch documents that and ensures that all drivers cope well
with a NULL return.

Signed-off-by: Nicolas Pitre <nico@linaro.org>
Reviewed-by: Eugenia Emantayev <eugenia@mellanox.com>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Acked-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent d270f76c

drivers/net/ethernet/intel/e1000e/ptp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -334,7 +334,7 @@ void e1000e_ptp_init(struct e1000_adapter *adapter)
		if (IS_ERR(adapter->ptp_clock)) {
		adapter->ptp_clock = NULL;
		e_err("ptp_clock_register failed\n");
		} else {
		} else if (adapter->ptp_clock) {
		e_info("registered PHC clock\n");
		}
		}

drivers/net/ethernet/intel/i40e/i40e_ptp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -669,7 +669,7 @@ void i40e_ptp_init(struct i40e_pf *pf)
		pf->ptp_clock = NULL;
		dev_err(&pf->pdev->dev, "%s: ptp_clock_register failed\n",
		__func__);
		} else {
		} else if (pf->ptp_clock) {
		struct timespec64 ts;
		u32 regval;

drivers/net/ethernet/intel/igb/igb_ptp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1159,7 +1159,7 @@ void igb_ptp_init(struct igb_adapter *adapter)
		if (IS_ERR(adapter->ptp_clock)) {
		adapter->ptp_clock = NULL;
		dev_err(&adapter->pdev->dev, "ptp_clock_register failed\n");
		} else {
		} else if (adapter->ptp_clock) {
		dev_info(&adapter->pdev->dev, "added PHC on %s\n",
		adapter->netdev->name);
		adapter->ptp_flags \|= IGB_PTP_ENABLED;

drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1254,7 +1254,7 @@ static long ixgbe_ptp_create_clock(struct ixgbe_adapter *adapter)
		adapter->ptp_clock = NULL;
		e_dev_err("ptp_clock_register failed\n");
		return err;
		} else
		} else if (adapter->ptp_clock)
		e_dev_info("registered PHC device on %s\n", netdev->name);

		/* set default timestamp mode to disabled here. We do this in

drivers/net/ethernet/mellanox/mlx4/en_clock.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -298,7 +298,7 @@ void mlx4_en_init_timestamp(struct mlx4_en_dev *mdev)
		if (IS_ERR(mdev->ptp_clock)) {
		mdev->ptp_clock = NULL;
		mlx4_err(mdev, "ptp_clock_register failed\n");
		} else {
		} else if (mdev->ptp_clock) {
		mlx4_info(mdev, "registered PHC clock\n");
		}