Commit 75ab70ec authored by Jacob Keller's avatar Jacob Keller Committed by David S. Miller
Browse files

ptp: remove the .adjfreq interface function 



Now that all drivers have been converted to .adjfine, we can remove the
.adjfreq from the interface structure.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e2bd9c76

drivers/ptp/ptp_clock.c

+1 −4
Original line number Diff line number Diff line
@@ -131,10 +131,7 @@ static int ptp_clock_adjtime(struct posix_clock *pc, struct __kernel_timex *tx) 
		long ppb = scaled_ppm_to_ppb(tx->freq);

		if (ppb > ops->max_adj || ppb < -ops->max_adj)

			return -ERANGE;

		if (ops->adjfine)

		err = ops->adjfine(ops, tx->freq);

		else

			err = ops->adjfreq(ops, ppb);

		ptp->dialed_frequency = tx->freq;

	} else if (tx->modes & ADJ_OFFSET) {

		if (ops->adjphase) {

include/linux/ptp_clock_kernel.h

+0 −7
Original line number Diff line number Diff line
@@ -77,12 +77,6 @@ struct ptp_system_timestamp { 
 *            nominal frequency in parts per million, but with a

 *            16 bit binary fractional field.

 *

 * @adjfreq:  Adjusts the frequency of the hardware clock.

 *            This method is deprecated.  New drivers should implement

 *            the @adjfine method instead.

 *            parameter delta: Desired frequency offset from nominal frequency

 *            in parts per billion

 *

 * @adjphase:  Adjusts the phase offset of the hardware clock.

 *             parameter delta: Desired change in nanoseconds.

 *
@@ -174,7 +168,6 @@ struct ptp_clock_info { 
	int pps;

	struct ptp_pin_desc *pin_config;

	int (*adjfine)(struct ptp_clock_info *ptp, long scaled_ppm);

	int (*adjfreq)(struct ptp_clock_info *ptp, s32 delta);

	int (*adjphase)(struct ptp_clock_info *ptp, s32 phase);

	int (*adjtime)(struct ptp_clock_info *ptp, s64 delta);

	int (*gettime64)(struct ptp_clock_info *ptp, struct timespec64 *ts);