Commit 9d9d415f authored by Radu Pirea (NXP OSS)'s avatar Radu Pirea (NXP OSS) Committed by David S. Miller

ptp: ptp_clock: make scaled_ppm_to_ppb static inline

Make scaled_ppm_to_ppb static inline to be able to build drivers that
use this function even with PTP_1588_CLOCK disabled.
Signed-off-by: default avatarRadu Pirea (NXP OSS) <radu-nicolae.pirea@oss.nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 532062b0
...@@ -63,27 +63,6 @@ static void enqueue_external_timestamp(struct timestamp_event_queue *queue, ...@@ -63,27 +63,6 @@ static void enqueue_external_timestamp(struct timestamp_event_queue *queue,
spin_unlock_irqrestore(&queue->lock, flags); spin_unlock_irqrestore(&queue->lock, flags);
} }
s32 scaled_ppm_to_ppb(long ppm)
{
/*
* The 'freq' field in the 'struct timex' is in parts per
* million, but with a 16 bit binary fractional field.
*
* We want to calculate
*
* ppb = scaled_ppm * 1000 / 2^16
*
* which simplifies to
*
* ppb = scaled_ppm * 125 / 2^13
*/
s64 ppb = 1 + ppm;
ppb *= 125;
ppb >>= 13;
return (s32) ppb;
}
EXPORT_SYMBOL(scaled_ppm_to_ppb);
/* posix clock implementation */ /* posix clock implementation */
static int ptp_clock_getres(struct posix_clock *pc, struct timespec64 *tp) static int ptp_clock_getres(struct posix_clock *pc, struct timespec64 *tp)
......
...@@ -186,6 +186,32 @@ struct ptp_clock_event { ...@@ -186,6 +186,32 @@ struct ptp_clock_event {
}; };
}; };
/**
* scaled_ppm_to_ppb() - convert scaled ppm to ppb
*
* @ppm: Parts per million, but with a 16 bit binary fractional field
*/
static inline s32 scaled_ppm_to_ppb(long ppm)
{
/*
* The 'freq' field in the 'struct timex' is in parts per
* million, but with a 16 bit binary fractional field.
*
* We want to calculate
*
* ppb = scaled_ppm * 1000 / 2^16
*
* which simplifies to
*
* ppb = scaled_ppm * 125 / 2^13
*/
s64 ppb = 1 + ppm;
ppb *= 125;
ppb >>= 13;
return (s32)ppb;
}
#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK) #if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)
/** /**
...@@ -229,14 +255,6 @@ extern void ptp_clock_event(struct ptp_clock *ptp, ...@@ -229,14 +255,6 @@ extern void ptp_clock_event(struct ptp_clock *ptp,
extern int ptp_clock_index(struct ptp_clock *ptp); extern int ptp_clock_index(struct ptp_clock *ptp);
/**
* scaled_ppm_to_ppb() - convert scaled ppm to ppb
*
* @ppm: Parts per million, but with a 16 bit binary fractional field
*/
extern s32 scaled_ppm_to_ppb(long ppm);
/** /**
* ptp_find_pin() - obtain the pin index of a given auxiliary function * ptp_find_pin() - obtain the pin index of a given auxiliary function
* *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment