]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: comedi: pcm3724: use default (*io) callback from 8255 module
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Sat, 19 Jul 2014 00:01:19 +0000 (17:01 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 Jul 2014 21:43:01 +0000 (14:43 -0700)
The private (*io) callback used by this driver is identical to the
default one provided by the 8255 module. Use the default one instead.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/pcm3724.c

index 53e73737a906644e0948f8f8d364341c998c2984..e88a5edce051982f64ac040ee223be3be4ab524b 100644 (file)
@@ -66,19 +66,6 @@ struct priv_pcm3724 {
        int dio_2;
 };
 
-static int subdev_8255_cb(int dir, int port, int data, unsigned long arg)
-{
-       unsigned long iobase = arg;
-       unsigned char inbres;
-       if (dir) {
-               outb(data, iobase + port);
-               return 0;
-       } else {
-               inbres = inb(iobase + port);
-               return inbres;
-       }
-}
-
 static int compute_buffer(int config, int devno, struct comedi_subdevice *s)
 {
        /* 1 in io_bits indicates output */
@@ -225,7 +212,7 @@ static int pcm3724_attach(struct comedi_device *dev,
 
        for (i = 0; i < dev->n_subdevices; i++) {
                s = &dev->subdevices[i];
-               ret = subdev_8255_init(dev, s, subdev_8255_cb,
+               ret = subdev_8255_init(dev, s, NULL,
                                       dev->iobase + SIZE_8255 * i);
                if (ret)
                        return ret;