From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Sat, 19 Jul 2014 00:01:19 +0000 (-0700)
Subject: staging: comedi: pcm3724: use default (*io) callback from 8255 module
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=75c04c2834eefe0ab4fb16051af62a399d633ebe;p=deliverable%2Flinux.git

staging: comedi: pcm3724: use default (*io) callback from 8255 module

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>
---

diff --git a/drivers/staging/comedi/drivers/pcm3724.c b/drivers/staging/comedi/drivers/pcm3724.c
index 53e73737a906..e88a5edce051 100644
--- a/drivers/staging/comedi/drivers/pcm3724.c
+++ b/drivers/staging/comedi/drivers/pcm3724.c
@@ -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;