Commit 11d892cc authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: ni_65xx: remove 'dio_direction' from private data

The IO Select registers are readable. Remove the need for the
'dio_direction' member in the private data by just checking the
register value for the INSN_CONFIG_DIO_QUERY instruction.

Also, refactor the switch statement to return -EINVAL for unhandled
instructions and have the (*insn_config) return insn->n normally.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8405e40e
...@@ -272,7 +272,6 @@ static inline unsigned ni_65xx_total_num_ports(const struct ni_65xx_board ...@@ -272,7 +272,6 @@ static inline unsigned ni_65xx_total_num_ports(const struct ni_65xx_board
struct ni_65xx_private { struct ni_65xx_private {
void __iomem *mmio; void __iomem *mmio;
unsigned short output_bits[NI_65XX_MAX_NUM_PORTS]; unsigned short output_bits[NI_65XX_MAX_NUM_PORTS];
unsigned short dio_direction[NI_65XX_MAX_NUM_PORTS];
}; };
struct ni_65xx_subdevice_private { struct ni_65xx_subdevice_private {
...@@ -322,35 +321,35 @@ static int ni_65xx_dio_insn_config(struct comedi_device *dev, ...@@ -322,35 +321,35 @@ static int ni_65xx_dio_insn_config(struct comedi_device *dev,
val &= ~chan_mask; val &= ~chan_mask;
} }
writeb(val, devpriv->mmio + NI_65XX_FILTER_ENA(port)); writeb(val, devpriv->mmio + NI_65XX_FILTER_ENA(port));
break;
return insn->n;
case INSN_CONFIG_DIO_OUTPUT: case INSN_CONFIG_DIO_OUTPUT:
if (s->type != COMEDI_SUBD_DIO) if (s->type != COMEDI_SUBD_DIO)
return -EINVAL; return -EINVAL;
devpriv->dio_direction[port] = COMEDI_OUTPUT;
writeb(NI_65XX_IO_SEL_OUTPUT, writeb(NI_65XX_IO_SEL_OUTPUT,
devpriv->mmio + NI_65XX_IO_SEL_REG(port)); devpriv->mmio + NI_65XX_IO_SEL_REG(port));
return 1;
break; break;
case INSN_CONFIG_DIO_INPUT: case INSN_CONFIG_DIO_INPUT:
if (s->type != COMEDI_SUBD_DIO) if (s->type != COMEDI_SUBD_DIO)
return -EINVAL; return -EINVAL;
devpriv->dio_direction[port] = COMEDI_INPUT;
writeb(NI_65XX_IO_SEL_INPUT, writeb(NI_65XX_IO_SEL_INPUT,
devpriv->mmio + NI_65XX_IO_SEL_REG(port)); devpriv->mmio + NI_65XX_IO_SEL_REG(port));
return 1;
break; break;
case INSN_CONFIG_DIO_QUERY: case INSN_CONFIG_DIO_QUERY:
if (s->type != COMEDI_SUBD_DIO) if (s->type != COMEDI_SUBD_DIO)
return -EINVAL; return -EINVAL;
data[1] = devpriv->dio_direction[port]; val = readb(devpriv->mmio + NI_65XX_IO_SEL_REG(port));
return insn->n; data[1] = (val == NI_65XX_IO_SEL_INPUT) ? COMEDI_INPUT
: COMEDI_OUTPUT;
break; break;
default: default:
break; return -EINVAL;
} }
return -EINVAL;
return insn->n;
} }
static int ni_65xx_dio_insn_bits(struct comedi_device *dev, static int ni_65xx_dio_insn_bits(struct comedi_device *dev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment