Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Jacob Keller <jacob.e.keller@intel.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Jacob Keller and committed by
David S. Miller
75ab70ec e2bd9c76

+1 -11
+1 -4
drivers/ptp/ptp_clock.c
··· 131 131 long ppb = scaled_ppm_to_ppb(tx->freq); 132 132 if (ppb > ops->max_adj || ppb < -ops->max_adj) 133 133 return -ERANGE; 134 - if (ops->adjfine) 135 - err = ops->adjfine(ops, tx->freq); 136 - else 137 - err = ops->adjfreq(ops, ppb); 134 + err = ops->adjfine(ops, tx->freq); 138 135 ptp->dialed_frequency = tx->freq; 139 136 } else if (tx->modes & ADJ_OFFSET) { 140 137 if (ops->adjphase) {
-7
include/linux/ptp_clock_kernel.h
··· 77 77 * nominal frequency in parts per million, but with a 78 78 * 16 bit binary fractional field. 79 79 * 80 - * @adjfreq: Adjusts the frequency of the hardware clock. 81 - * This method is deprecated. New drivers should implement 82 - * the @adjfine method instead. 83 - * parameter delta: Desired frequency offset from nominal frequency 84 - * in parts per billion 85 - * 86 80 * @adjphase: Adjusts the phase offset of the hardware clock. 87 81 * parameter delta: Desired change in nanoseconds. 88 82 * ··· 168 174 int pps; 169 175 struct ptp_pin_desc *pin_config; 170 176 int (*adjfine)(struct ptp_clock_info *ptp, long scaled_ppm); 171 - int (*adjfreq)(struct ptp_clock_info *ptp, s32 delta); 172 177 int (*adjphase)(struct ptp_clock_info *ptp, s32 phase); 173 178 int (*adjtime)(struct ptp_clock_info *ptp, s64 delta); 174 179 int (*gettime64)(struct ptp_clock_info *ptp, struct timespec64 *ts);