Commit add873f2 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

staging: comedi: amplc_dio200: shrink struct dio200_subdev_intr

Shave a few bytes off the size of `struct dio200_subdev_intr` by
rearranging members and changing two of them to bit-fields.
Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f7282f05
...@@ -581,13 +581,13 @@ struct dio200_subdev_8255 { ...@@ -581,13 +581,13 @@ struct dio200_subdev_8255 {
}; };
struct dio200_subdev_intr { struct dio200_subdev_intr {
unsigned int ofs;
spinlock_t spinlock; spinlock_t spinlock;
int active; unsigned int ofs;
unsigned int valid_isns; unsigned int valid_isns;
unsigned int enabled_isns; unsigned int enabled_isns;
unsigned int stopcount; unsigned int stopcount;
int continuous; bool active:1;
bool continuous:1;
}; };
static inline const struct dio200_layout * static inline const struct dio200_layout *
...@@ -723,7 +723,7 @@ static void dio200_stop_intr(struct comedi_device *dev, ...@@ -723,7 +723,7 @@ static void dio200_stop_intr(struct comedi_device *dev,
const struct dio200_layout *layout = dio200_dev_layout(dev); const struct dio200_layout *layout = dio200_dev_layout(dev);
struct dio200_subdev_intr *subpriv = s->private; struct dio200_subdev_intr *subpriv = s->private;
subpriv->active = 0; subpriv->active = false;
subpriv->enabled_isns = 0; subpriv->enabled_isns = 0;
if (layout->has_int_sce) if (layout->has_int_sce)
dio200_write8(dev, subpriv->ofs, 0); dio200_write8(dev, subpriv->ofs, 0);
...@@ -745,7 +745,7 @@ static int dio200_start_intr(struct comedi_device *dev, ...@@ -745,7 +745,7 @@ static int dio200_start_intr(struct comedi_device *dev,
if (!subpriv->continuous && subpriv->stopcount == 0) { if (!subpriv->continuous && subpriv->stopcount == 0) {
/* An empty acquisition! */ /* An empty acquisition! */
s->async->events |= COMEDI_CB_EOA; s->async->events |= COMEDI_CB_EOA;
subpriv->active = 0; subpriv->active = false;
retval = 1; retval = 1;
} else { } else {
/* Determine interrupt sources to enable. */ /* Determine interrupt sources to enable. */
...@@ -998,12 +998,12 @@ static int dio200_subdev_intr_cmd(struct comedi_device *dev, ...@@ -998,12 +998,12 @@ static int dio200_subdev_intr_cmd(struct comedi_device *dev,
/* Set up end of acquisition. */ /* Set up end of acquisition. */
switch (cmd->stop_src) { switch (cmd->stop_src) {
case TRIG_COUNT: case TRIG_COUNT:
subpriv->continuous = 0; subpriv->continuous = false;
subpriv->stopcount = cmd->stop_arg; subpriv->stopcount = cmd->stop_arg;
break; break;
default: default:
/* TRIG_NONE */ /* TRIG_NONE */
subpriv->continuous = 1; subpriv->continuous = true;
subpriv->stopcount = 0; subpriv->stopcount = 0;
break; break;
} }
......
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