Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[pandora-kernel.git] / drivers / parport / daisy.c

diff --git a/drivers/parport/daisy.c b/drivers/parport/daisy.c
index ff9f344..3c8f06c 100644 (file)
--- a/drivers/parport/daisy.c
+++ b/drivers/parport/daisy.c
@@ -199,11 +199,6 @@ void parport_daisy_fini(struct parport *port)
  *     parport_open - find a device by canonical device number
  *     @devnum: canonical device number
  *     @name: name to associate with the device
- *     @pf: preemption callback
- *     @kf: kick callback
- *     @irqf: interrupt handler
- *     @flags: registration flags
- *     @handle: driver data
  *
  *     This function is similar to parport_register_device(), except
  *     that it locates a device by its number rather than by the port
@@ -214,10 +209,7 @@ void parport_daisy_fini(struct parport *port)
  *     for parport_register_device().
  **/
 
-struct pardevice *parport_open(int devnum, const char *name,
-                               int (*pf) (void *), void (*kf) (void *),
-                               void (*irqf) (int, void *),
-                               int flags, void *handle)
+struct pardevice *parport_open(int devnum, const char *name)
 {
        struct daisydev *p = topology;
        struct parport *port;
@@ -237,8 +229,7 @@ struct pardevice *parport_open(int devnum, const char *name,
        port = parport_get_port(p->port);
        spin_unlock(&topology_lock);
 
-       dev = parport_register_device(port, name, pf, kf,
-                                      irqf, flags, handle);
+       dev = parport_register_device(port, name, NULL, NULL, NULL, 0, NULL);
        parport_put_port(port);
        if (!dev)
                return NULL;
@@ -275,35 +266,6 @@ void parport_close(struct pardevice *dev)
        parport_unregister_device(dev);
 }
 
-/**
- *     parport_device_num - convert device coordinates
- *     @parport: parallel port number
- *     @mux: multiplexor port number (-1 for no multiplexor)
- *     @daisy: daisy chain address (-1 for no daisy chain address)
- *
- *     This tries to locate a device on the given parallel port,
- *     multiplexor port and daisy chain address, and returns its
- *     device number or %-ENXIO if no device with those coordinates
- *     exists.
- **/
-
-int parport_device_num(int parport, int mux, int daisy)
-{
-       int res = -ENXIO;
-       struct daisydev *dev;
-
-       spin_lock(&topology_lock);
-       dev = topology;
-       while (dev && dev->port->portnum != parport &&
-              dev->port->muxport != mux && dev->daisy != daisy)
-               dev = dev->next;
-       if (dev)
-               res = dev->devnum;
-       spin_unlock(&topology_lock);
-
-       return res;
-}
-
 /* Send a daisy-chain-style CPP command packet. */
 static int cpp_daisy(struct parport *port, int cmd)
 {