aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/parport/procfs.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-06-06 19:35:10 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-06 19:35:10 -0400
commit57d326169e878a1a37b2bccd1cf81f6809ee67b9 (patch)
tree86ed74ae4dc2beaebce1c67b8459f1873b777d3a /drivers/parport/procfs.c
parent7b215de3d0abbc4f6daf2efd19e8809af0564490 (diff)
parent0244756edc4b98c129e92c7061d9f383708cf786 (diff)
Merge branch 'akpm' (patches from Andrew Morton) into next
Merge more updates from Andrew Morton: - Most of the rest of MM. This includes "mark remap_file_pages syscall as deprecated" but the actual "replace remap_file_pages syscall with emulation" is held back. I guess we'll need to work out when to pull the trigger on that one. - various minor cleanups to obscure filesystems - the drivers/rtc queue - hfsplus updates - ufs, hpfs, fatfs, affs, reiserfs - Documentation/ - signals - procfs - cpu hotplug - lib/idr.c - rapidio - sysctl - ipc updates * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (171 commits) ufs: sb mutex merge + mutex_destroy powerpc: update comments for generic idle conversion cris: update comments for generic idle conversion idle: remove cpu_idle() forward declarations nbd: zero from and len fields in NBD_CMD_DISCONNECT. mm: convert some level-less printks to pr_* MAINTAINERS: adi-buildroot-devel is moderated MAINTAINERS: add linux-api for review of API/ABI changes mm/kmemleak-test.c: use pr_fmt for logging fs/dlm/debug_fs.c: replace seq_printf by seq_puts fs/dlm/lockspace.c: convert simple_str to kstr fs/dlm/config.c: convert simple_str to kstr mm: mark remap_file_pages() syscall as deprecated mm: memcontrol: remove unnecessary memcg argument from soft limit functions mm: memcontrol: clean up memcg zoneinfo lookup mm/memblock.c: call kmemleak directly from memblock_(alloc|free) mm/mempool.c: update the kmemleak stack trace for mempool allocations lib/radix-tree.c: update the kmemleak stack trace for radix tree allocations mm: introduce kmemleak_update_trace() mm/kmemleak.c: use %u to print ->checksum ...
Diffstat (limited to 'drivers/parport/procfs.c')
-rw-r--r--drivers/parport/procfs.c58
1 files changed, 29 insertions, 29 deletions
diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
index 92ed045a5f93..3b470801a04f 100644
--- a/drivers/parport/procfs.c
+++ b/drivers/parport/procfs.c
@@ -31,7 +31,7 @@
31#define PARPORT_MIN_SPINTIME_VALUE 1 31#define PARPORT_MIN_SPINTIME_VALUE 1
32#define PARPORT_MAX_SPINTIME_VALUE 1000 32#define PARPORT_MAX_SPINTIME_VALUE 1000
33 33
34static int do_active_device(ctl_table *table, int write, 34static int do_active_device(struct ctl_table *table, int write,
35 void __user *result, size_t *lenp, loff_t *ppos) 35 void __user *result, size_t *lenp, loff_t *ppos)
36{ 36{
37 struct parport *port = (struct parport *)table->extra1; 37 struct parport *port = (struct parport *)table->extra1;
@@ -68,7 +68,7 @@ static int do_active_device(ctl_table *table, int write,
68} 68}
69 69
70#ifdef CONFIG_PARPORT_1284 70#ifdef CONFIG_PARPORT_1284
71static int do_autoprobe(ctl_table *table, int write, 71static int do_autoprobe(struct ctl_table *table, int write,
72 void __user *result, size_t *lenp, loff_t *ppos) 72 void __user *result, size_t *lenp, loff_t *ppos)
73{ 73{
74 struct parport_device_info *info = table->extra2; 74 struct parport_device_info *info = table->extra2;
@@ -110,9 +110,9 @@ static int do_autoprobe(ctl_table *table, int write,
110} 110}
111#endif /* IEEE1284.3 support. */ 111#endif /* IEEE1284.3 support. */
112 112
113static int do_hardware_base_addr (ctl_table *table, int write, 113static int do_hardware_base_addr(struct ctl_table *table, int write,
114 void __user *result, 114 void __user *result,
115 size_t *lenp, loff_t *ppos) 115 size_t *lenp, loff_t *ppos)
116{ 116{
117 struct parport *port = (struct parport *)table->extra1; 117 struct parport *port = (struct parport *)table->extra1;
118 char buffer[20]; 118 char buffer[20];
@@ -138,9 +138,9 @@ static int do_hardware_base_addr (ctl_table *table, int write,
138 return copy_to_user(result, buffer, len) ? -EFAULT : 0; 138 return copy_to_user(result, buffer, len) ? -EFAULT : 0;
139} 139}
140 140
141static int do_hardware_irq (ctl_table *table, int write, 141static int do_hardware_irq(struct ctl_table *table, int write,
142 void __user *result, 142 void __user *result,
143 size_t *lenp, loff_t *ppos) 143 size_t *lenp, loff_t *ppos)
144{ 144{
145 struct parport *port = (struct parport *)table->extra1; 145 struct parport *port = (struct parport *)table->extra1;
146 char buffer[20]; 146 char buffer[20];
@@ -166,9 +166,9 @@ static int do_hardware_irq (ctl_table *table, int write,
166 return copy_to_user(result, buffer, len) ? -EFAULT : 0; 166 return copy_to_user(result, buffer, len) ? -EFAULT : 0;
167} 167}
168 168
169static int do_hardware_dma (ctl_table *table, int write, 169static int do_hardware_dma(struct ctl_table *table, int write,
170 void __user *result, 170 void __user *result,
171 size_t *lenp, loff_t *ppos) 171 size_t *lenp, loff_t *ppos)
172{ 172{
173 struct parport *port = (struct parport *)table->extra1; 173 struct parport *port = (struct parport *)table->extra1;
174 char buffer[20]; 174 char buffer[20];
@@ -194,9 +194,9 @@ static int do_hardware_dma (ctl_table *table, int write,
194 return copy_to_user(result, buffer, len) ? -EFAULT : 0; 194 return copy_to_user(result, buffer, len) ? -EFAULT : 0;
195} 195}
196 196
197static int do_hardware_modes (ctl_table *table, int write, 197static int do_hardware_modes(struct ctl_table *table, int write,
198 void __user *result, 198 void __user *result,
199 size_t *lenp, loff_t *ppos) 199 size_t *lenp, loff_t *ppos)
200{ 200{
201 struct parport *port = (struct parport *)table->extra1; 201 struct parport *port = (struct parport *)table->extra1;
202 char buffer[40]; 202 char buffer[40];
@@ -255,11 +255,11 @@ PARPORT_MAX_SPINTIME_VALUE;
255 255
256struct parport_sysctl_table { 256struct parport_sysctl_table {
257 struct ctl_table_header *sysctl_header; 257 struct ctl_table_header *sysctl_header;
258 ctl_table vars[12]; 258 struct ctl_table vars[12];
259 ctl_table device_dir[2]; 259 struct ctl_table device_dir[2];
260 ctl_table port_dir[2]; 260 struct ctl_table port_dir[2];
261 ctl_table parport_dir[2]; 261 struct ctl_table parport_dir[2];
262 ctl_table dev_dir[2]; 262 struct ctl_table dev_dir[2];
263}; 263};
264 264
265static const struct parport_sysctl_table parport_sysctl_template = { 265static const struct parport_sysctl_table parport_sysctl_template = {
@@ -369,12 +369,12 @@ static const struct parport_sysctl_table parport_sysctl_template = {
369struct parport_device_sysctl_table 369struct parport_device_sysctl_table
370{ 370{
371 struct ctl_table_header *sysctl_header; 371 struct ctl_table_header *sysctl_header;
372 ctl_table vars[2]; 372 struct ctl_table vars[2];
373 ctl_table device_dir[2]; 373 struct ctl_table device_dir[2];
374 ctl_table devices_root_dir[2]; 374 struct ctl_table devices_root_dir[2];
375 ctl_table port_dir[2]; 375 struct ctl_table port_dir[2];
376 ctl_table parport_dir[2]; 376 struct ctl_table parport_dir[2];
377 ctl_table dev_dir[2]; 377 struct ctl_table dev_dir[2];
378}; 378};
379 379
380static const struct parport_device_sysctl_table 380static const struct parport_device_sysctl_table
@@ -422,10 +422,10 @@ parport_device_sysctl_template = {
422struct parport_default_sysctl_table 422struct parport_default_sysctl_table
423{ 423{
424 struct ctl_table_header *sysctl_header; 424 struct ctl_table_header *sysctl_header;
425 ctl_table vars[3]; 425 struct ctl_table vars[3];
426 ctl_table default_dir[2]; 426 struct ctl_table default_dir[2];
427 ctl_table parport_dir[2]; 427 struct ctl_table parport_dir[2];
428 ctl_table dev_dir[2]; 428 struct ctl_table dev_dir[2];
429}; 429};
430 430
431static struct parport_default_sysctl_table 431static struct parport_default_sysctl_table