From 8214d22fa8cfe9d98ba4312e9d032fe23a9ebfe9 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 23 Oct 2012 16:28:30 -0700
Subject: [PATCH] --- yaml --- r: 337205 b: refs/heads/master c:
 32bd027dd700744b29b89c38353b5597e70ce802 h: refs/heads/master i:   337203:
 0b0d9b72a880a1799cfed1748430ade7e517792e v: v3

---
 [refs]                                         |  2 +-
 trunk/drivers/staging/comedi/drivers/ni_660x.c | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 7b6eb911e5d3..b81e3583126c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0f6959fbb318c1fb08c79503815b2cdd79d7554
+refs/heads/master: 32bd027dd700744b29b89c38353b5597e70ce802
diff --git a/trunk/drivers/staging/comedi/drivers/ni_660x.c b/trunk/drivers/staging/comedi/drivers/ni_660x.c
index 3f8ac5668252..cdadc0be9626 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_660x.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_660x.c
@@ -1114,14 +1114,6 @@ static int ni_660x_set_pfi_routing(struct comedi_device *dev, unsigned chan,
 	return 0;
 }
 
-static unsigned ni_660x_get_pfi_routing(struct comedi_device *dev,
-					unsigned chan)
-{
-	struct ni_660x_private *devpriv = dev->private;
-
-	return devpriv->pfi_output_selects[chan];
-}
-
 static void ni660x_config_filter(struct comedi_device *dev,
 				 unsigned pfi_channel,
 				 enum ni_gpct_filter_select filter)
@@ -1163,7 +1155,7 @@ static int ni_660x_dio_insn_config(struct comedi_device *dev,
 		return ni_660x_set_pfi_routing(dev, chan, data[1]);
 		break;
 	case INSN_CONFIG_GET_ROUTING:
-		data[1] = ni_660x_get_pfi_routing(dev, chan);
+		data[1] = devpriv->pfi_output_selects[chan];
 		break;
 	case INSN_CONFIG_FILTER:
 		ni660x_config_filter(dev, chan, data[1]);