AX88772C_eeprom and ax8872c build together

hc

2024-05-16 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb

 kernel/fs/coda/coda_linux.c
..
..
@@ -18,7 +18,7 @@
18
18
 #include <linux/string.h>
19
19
 
20
20
 #include <linux/coda.h>
21
-#include <linux/coda_psdev.h>
21
+#include "coda_psdev.h"
22
22
 #include "coda_linux.h"
23
23
 
24
24
 /* initialize the debugging variables */
..
..
@@ -66,6 +66,25 @@
66
66
 	return coda_flags;
67
67
 }
68
68
 
69
+static struct timespec64 coda_to_timespec64(struct coda_timespec ts)
70
+{
71
+	struct timespec64 ts64 = {
72
+		.tv_sec = ts.tv_sec,
73
+		.tv_nsec = ts.tv_nsec,
74
+	};
75
+
76
+	return ts64;
77
+}
78
+
79
+static struct coda_timespec timespec64_to_coda(struct timespec64 ts64)
80
+{
81
+	struct coda_timespec ts = {
82
+		.tv_sec = ts64.tv_sec,
83
+		.tv_nsec = ts64.tv_nsec,
84
+	};
85
+
86
+	return ts;
87
+}
69
88
 
70
89
 /* utility functions below */
71
90
 void coda_vattr_to_iattr(struct inode *inode, struct coda_vattr *attr)
..
..
@@ -105,11 +124,11 @@
105
124
 	if (attr->va_size != -1)
106
125
 		inode->i_blocks = (attr->va_size + 511) >> 9;
107
126
 	if (attr->va_atime.tv_sec != -1) 
108
-		inode->i_atime = timespec_to_timespec64(attr->va_atime);
127
+		inode->i_atime = coda_to_timespec64(attr->va_atime);
109
128
 	if (attr->va_mtime.tv_sec != -1)
110
-		inode->i_mtime = timespec_to_timespec64(attr->va_mtime);
129
+		inode->i_mtime = coda_to_timespec64(attr->va_mtime);
111
130
         if (attr->va_ctime.tv_sec != -1)
112
-		inode->i_ctime = timespec_to_timespec64(attr->va_ctime);
131
+		inode->i_ctime = coda_to_timespec64(attr->va_ctime);
113
132
 }
114
133
 
115
134
 
..
..
@@ -130,12 +149,12 @@
130
149
         vattr->va_uid = (vuid_t) -1; 
131
150
         vattr->va_gid = (vgid_t) -1;
132
151
         vattr->va_size = (off_t) -1;
133
-	vattr->va_atime.tv_sec = (time_t) -1;
134
-	vattr->va_atime.tv_nsec =  (time_t) -1;
135
-        vattr->va_mtime.tv_sec = (time_t) -1;
136
-        vattr->va_mtime.tv_nsec = (time_t) -1;
137
-	vattr->va_ctime.tv_sec = (time_t) -1;
138
-	vattr->va_ctime.tv_nsec = (time_t) -1;
152
+	vattr->va_atime.tv_sec = (int64_t) -1;
153
+	vattr->va_atime.tv_nsec = (long) -1;
154
+	vattr->va_mtime.tv_sec = (int64_t) -1;
155
+	vattr->va_mtime.tv_nsec = (long) -1;
156
+	vattr->va_ctime.tv_sec = (int64_t) -1;
157
+	vattr->va_ctime.tv_nsec = (long) -1;
139
158
         vattr->va_type = C_VNON;
140
159
 	vattr->va_fileid = -1;
141
160
 	vattr->va_gen = -1;
..
..
@@ -175,13 +194,13 @@
175
194
                 vattr->va_size = iattr->ia_size;
176
195
 	}
177
196
         if ( valid & ATTR_ATIME ) {
178
-		vattr->va_atime = timespec64_to_timespec(iattr->ia_atime);
197
+		vattr->va_atime = timespec64_to_coda(iattr->ia_atime);
179
198
 	}
180
199
         if ( valid & ATTR_MTIME ) {
181
-		vattr->va_mtime = timespec64_to_timespec(iattr->ia_mtime);
200
+		vattr->va_mtime = timespec64_to_coda(iattr->ia_mtime);
182
201
 	}
183
202
         if ( valid & ATTR_CTIME ) {
184
-		vattr->va_ctime = timespec64_to_timespec(iattr->ia_ctime);
203
+		vattr->va_ctime = timespec64_to_coda(iattr->ia_ctime);
185
204
 	}
186
205
 }
187
206