diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2007-10-18 06:05:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 17:37:23 -0400 |
commit | 25398a158d86b993fa5bf36f5a6752134b584d60 (patch) | |
tree | 38a1db45fdeb8cfa691cf6f1b38a762773e5b950 /drivers/parport/daisy.c | |
parent | 0d135a4a8c77f248afd908bc3cf5bd833062589d (diff) |
sysctl: parport remove binary paths
The sysctl binary paths don't look as if they even code work, .data is not
filled in, and all of the proc_handlers look at extra1 and there is not
strategy routine.
So just kill the binary paths.
In addition this patch removes the setting of extra1 on directories. It
doesn't look like the parport code ever examines it, and it's bad sysctl form.
[bunk@kernel.org: remove parport_device_num()]
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/parport/daisy.c')
-rw-r--r-- | drivers/parport/daisy.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/drivers/parport/daisy.c b/drivers/parport/daisy.c index ff9f34453530..5bbff2028f8f 100644 --- a/drivers/parport/daisy.c +++ b/drivers/parport/daisy.c | |||
@@ -275,35 +275,6 @@ void parport_close(struct pardevice *dev) | |||
275 | parport_unregister_device(dev); | 275 | parport_unregister_device(dev); |
276 | } | 276 | } |
277 | 277 | ||
278 | /** | ||
279 | * parport_device_num - convert device coordinates | ||
280 | * @parport: parallel port number | ||
281 | * @mux: multiplexor port number (-1 for no multiplexor) | ||
282 | * @daisy: daisy chain address (-1 for no daisy chain address) | ||
283 | * | ||
284 | * This tries to locate a device on the given parallel port, | ||
285 | * multiplexor port and daisy chain address, and returns its | ||
286 | * device number or %-ENXIO if no device with those coordinates | ||
287 | * exists. | ||
288 | **/ | ||
289 | |||
290 | int parport_device_num(int parport, int mux, int daisy) | ||
291 | { | ||
292 | int res = -ENXIO; | ||
293 | struct daisydev *dev; | ||
294 | |||
295 | spin_lock(&topology_lock); | ||
296 | dev = topology; | ||
297 | while (dev && dev->port->portnum != parport && | ||
298 | dev->port->muxport != mux && dev->daisy != daisy) | ||
299 | dev = dev->next; | ||
300 | if (dev) | ||
301 | res = dev->devnum; | ||
302 | spin_unlock(&topology_lock); | ||
303 | |||
304 | return res; | ||
305 | } | ||
306 | |||
307 | /* Send a daisy-chain-style CPP command packet. */ | 278 | /* Send a daisy-chain-style CPP command packet. */ |
308 | static int cpp_daisy(struct parport *port, int cmd) | 279 | static int cpp_daisy(struct parport *port, int cmd) |
309 | { | 280 | { |