projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[MIPS] Deforest the function pointer jungle in the time code.
[firefly-linux-kernel-4.4.55.git]
/
arch
/
mips
/
lasat
/
sysctl.c
diff --git
a/arch/mips/lasat/sysctl.c
b/arch/mips/lasat/sysctl.c
index 4575a829766d64b5497b4c29a0b324b4c92e9055..389336c4ecc5b85b1966384f7e232944376a9aa3 100644
(file)
--- a/
arch/mips/lasat/sysctl.c
+++ b/
arch/mips/lasat/sysctl.c
@@
-32,6
+32,8
@@
#include <linux/mutex.h>
#include <linux/uaccess.h>
#include <linux/mutex.h>
#include <linux/uaccess.h>
+#include <asm/time.h>
+
#include "sysctl.h"
#include "ds1603.h"
#include "sysctl.h"
#include "ds1603.h"
@@
-106,7
+108,7
@@
int proc_dolasatrtc(ctl_table *table, int write, struct file *filp,
mutex_lock(&lasat_info_mutex);
if (!write) {
mutex_lock(&lasat_info_mutex);
if (!write) {
- rtctmp =
ds1603_read
();
+ rtctmp =
read_persistent_clock
();
/* check for time < 0 and set to 0 */
if (rtctmp < 0)
rtctmp = 0;
/* check for time < 0 and set to 0 */
if (rtctmp < 0)
rtctmp = 0;
@@
-116,7
+118,7
@@
int proc_dolasatrtc(ctl_table *table, int write, struct file *filp,
mutex_unlock(&lasat_info_mutex);
return r;
}
mutex_unlock(&lasat_info_mutex);
return r;
}
-
ds1603_set
(rtctmp);
+
rtc_mips_set_mmss
(rtctmp);
mutex_unlock(&lasat_info_mutex);
return 0;
mutex_unlock(&lasat_info_mutex);
return 0;
@@
-152,7
+154,7
@@
int sysctl_lasat_rtc(ctl_table *table, int *name, int nlen,
int r;
mutex_lock(&lasat_info_mutex);
int r;
mutex_lock(&lasat_info_mutex);
- rtctmp =
ds1603_read
();
+ rtctmp =
read_persistent_clock
();
if (rtctmp < 0)
rtctmp = 0;
r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);
if (rtctmp < 0)
rtctmp = 0;
r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);
@@
-161,7
+163,7
@@
int sysctl_lasat_rtc(ctl_table *table, int *name, int nlen,
return r;
}
if (newval && newlen)
return r;
}
if (newval && newlen)
-
ds1603_set
(rtctmp);
+
rtc_mips_set_mmss
(rtctmp);
mutex_unlock(&lasat_info_mutex);
return 1;
mutex_unlock(&lasat_info_mutex);
return 1;