forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-10 cde9070d9970eef1f7ec2360586c802a16230ad8
kernel/drivers/parport/procfs.c
....@@ -34,7 +34,7 @@
3434 #define PARPORT_MAX_SPINTIME_VALUE 1000
3535
3636 static int do_active_device(struct ctl_table *table, int write,
37
- void __user *result, size_t *lenp, loff_t *ppos)
37
+ void *result, size_t *lenp, loff_t *ppos)
3838 {
3939 struct parport *port = (struct parport *)table->extra1;
4040 char buffer[256];
....@@ -65,13 +65,13 @@
6565 *lenp = len;
6666
6767 *ppos += len;
68
-
69
- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
68
+ memcpy(result, buffer, len);
69
+ return 0;
7070 }
7171
7272 #ifdef CONFIG_PARPORT_1284
7373 static int do_autoprobe(struct ctl_table *table, int write,
74
- void __user *result, size_t *lenp, loff_t *ppos)
74
+ void *result, size_t *lenp, loff_t *ppos)
7575 {
7676 struct parport_device_info *info = table->extra2;
7777 const char *str;
....@@ -108,13 +108,13 @@
108108
109109 *ppos += len;
110110
111
- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
111
+ memcpy(result, buffer, len);
112
+ return 0;
112113 }
113114 #endif /* IEEE1284.3 support. */
114115
115116 static int do_hardware_base_addr(struct ctl_table *table, int write,
116
- void __user *result,
117
- size_t *lenp, loff_t *ppos)
117
+ void *result, size_t *lenp, loff_t *ppos)
118118 {
119119 struct parport *port = (struct parport *)table->extra1;
120120 char buffer[20];
....@@ -136,13 +136,12 @@
136136 *lenp = len;
137137
138138 *ppos += len;
139
-
140
- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
139
+ memcpy(result, buffer, len);
140
+ return 0;
141141 }
142142
143143 static int do_hardware_irq(struct ctl_table *table, int write,
144
- void __user *result,
145
- size_t *lenp, loff_t *ppos)
144
+ void *result, size_t *lenp, loff_t *ppos)
146145 {
147146 struct parport *port = (struct parport *)table->extra1;
148147 char buffer[20];
....@@ -164,13 +163,12 @@
164163 *lenp = len;
165164
166165 *ppos += len;
167
-
168
- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
166
+ memcpy(result, buffer, len);
167
+ return 0;
169168 }
170169
171170 static int do_hardware_dma(struct ctl_table *table, int write,
172
- void __user *result,
173
- size_t *lenp, loff_t *ppos)
171
+ void *result, size_t *lenp, loff_t *ppos)
174172 {
175173 struct parport *port = (struct parport *)table->extra1;
176174 char buffer[20];
....@@ -192,13 +190,12 @@
192190 *lenp = len;
193191
194192 *ppos += len;
195
-
196
- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
193
+ memcpy(result, buffer, len);
194
+ return 0;
197195 }
198196
199197 static int do_hardware_modes(struct ctl_table *table, int write,
200
- void __user *result,
201
- size_t *lenp, loff_t *ppos)
198
+ void *result, size_t *lenp, loff_t *ppos)
202199 {
203200 struct parport *port = (struct parport *)table->extra1;
204201 char buffer[40];
....@@ -213,7 +210,11 @@
213210 return -EACCES;
214211
215212 {
216
-#define printmode(x) {if(port->modes&PARPORT_MODE_##x){len+=sprintf(buffer+len,"%s%s",f?",":"",#x);f++;}}
213
+#define printmode(x) \
214
+do { \
215
+ if (port->modes & PARPORT_MODE_##x) \
216
+ len += sprintf(buffer + len, "%s%s", f++ ? "," : "", #x); \
217
+} while (0)
217218 int f = 0;
218219 printmode(PCSPP);
219220 printmode(TRISTATE);
....@@ -231,8 +232,8 @@
231232 *lenp = len;
232233
233234 *ppos += len;
234
-
235
- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
235
+ memcpy(result, buffer, len);
236
+ return 0;
236237 }
237238
238239 #define PARPORT_PORT_DIR(CHILD) { .procname = NULL, .mode = 0555, .child = CHILD }