From: H Hartley Sweeten Date: Tue, 23 Oct 2012 23:28:30 +0000 (-0700) Subject: staging: comedi: ni_660x: remove ni_660x_get_pfi_routing() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=32bd027dd700744b29b89c38353b5597e70ce802;p=linux-beck.git staging: comedi: ni_660x: remove ni_660x_get_pfi_routing() This simple function is only called by ni_660x_dio_insn_config(). Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c index 3f8ac5668252..cdadc0be9626 100644 --- a/drivers/staging/comedi/drivers/ni_660x.c +++ b/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]);