aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/stmicro
diff options
context:
space:
mode:
authorRichard Cochran <richardcochran@gmail.com>2015-03-29 17:12:07 -0400
committerDavid S. Miller <davem@davemloft.net>2015-03-31 12:01:18 -0400
commit3f6c4654c8bff4230ba279a7b5b6d8721b572ddf (patch)
tree3a28fe8b9de7c34bfe640bfc2a356249e8686b2b /drivers/net/ethernet/stmicro
parent0fcb5c76ca71afbef6c18d0710f2d4557b1d216a (diff)
ptp: stmmac: convert to the 64 bit get/set time methods.
This device stores the number of seconds in a 32 bit register. So more work is needed on this driver before the year 2038 comes around. Compile tested only. Signed-off-by: Richard Cochran <richardcochran@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro')
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
index c5ee79d8a8c5..172f3188361e 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
@@ -105,7 +105,7 @@ static int stmmac_adjust_time(struct ptp_clock_info *ptp, s64 delta)
105 * Description: this function will read the current time from the 105 * Description: this function will read the current time from the
106 * hardware clock and store it in @ts. 106 * hardware clock and store it in @ts.
107 */ 107 */
108static int stmmac_get_time(struct ptp_clock_info *ptp, struct timespec *ts) 108static int stmmac_get_time(struct ptp_clock_info *ptp, struct timespec64 *ts)
109{ 109{
110 struct stmmac_priv *priv = 110 struct stmmac_priv *priv =
111 container_of(ptp, struct stmmac_priv, ptp_clock_ops); 111 container_of(ptp, struct stmmac_priv, ptp_clock_ops);
@@ -135,7 +135,7 @@ static int stmmac_get_time(struct ptp_clock_info *ptp, struct timespec *ts)
135 * hardware clock. 135 * hardware clock.
136 */ 136 */
137static int stmmac_set_time(struct ptp_clock_info *ptp, 137static int stmmac_set_time(struct ptp_clock_info *ptp,
138 const struct timespec *ts) 138 const struct timespec64 *ts)
139{ 139{
140 struct stmmac_priv *priv = 140 struct stmmac_priv *priv =
141 container_of(ptp, struct stmmac_priv, ptp_clock_ops); 141 container_of(ptp, struct stmmac_priv, ptp_clock_ops);
@@ -168,8 +168,8 @@ static struct ptp_clock_info stmmac_ptp_clock_ops = {
168 .pps = 0, 168 .pps = 0,
169 .adjfreq = stmmac_adjust_freq, 169 .adjfreq = stmmac_adjust_freq,
170 .adjtime = stmmac_adjust_time, 170 .adjtime = stmmac_adjust_time,
171 .gettime = stmmac_get_time, 171 .gettime64 = stmmac_get_time,
172 .settime = stmmac_set_time, 172 .settime64 = stmmac_set_time,
173 .enable = stmmac_enable, 173 .enable = stmmac_enable,
174}; 174};
175 175