Commit 61c9fb0e authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: comedi_buf: rename comedi_reset_async_buf()

For aesthetic reasons, rename this function to comedi_buf_reset(). This
makes all the asynchronous buffer functions have the same namespace.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6bd76457
...@@ -140,7 +140,7 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s, ...@@ -140,7 +140,7 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
return 0; return 0;
} }
void comedi_reset_async_buf(struct comedi_async *async) void comedi_buf_reset(struct comedi_async *async)
{ {
async->buf_write_alloc_count = 0; async->buf_write_alloc_count = 0;
async->buf_write_count = 0; async->buf_write_count = 0;
......
...@@ -408,7 +408,7 @@ static void do_become_nonbusy(struct comedi_device *dev, ...@@ -408,7 +408,7 @@ static void do_become_nonbusy(struct comedi_device *dev,
comedi_set_subdevice_runflags(s, SRF_RUNNING, 0); comedi_set_subdevice_runflags(s, SRF_RUNNING, 0);
if (async) { if (async) {
comedi_reset_async_buf(async); comedi_buf_reset(async);
async->inttrig = NULL; async->inttrig = NULL;
kfree(async->cmd.chanlist); kfree(async->cmd.chanlist);
async->cmd.chanlist = NULL; async->cmd.chanlist = NULL;
...@@ -1338,7 +1338,7 @@ static int do_cmd_ioctl(struct comedi_device *dev, ...@@ -1338,7 +1338,7 @@ static int do_cmd_ioctl(struct comedi_device *dev,
goto cleanup; goto cleanup;
} }
comedi_reset_async_buf(async); comedi_buf_reset(async);
async->cb_mask = async->cb_mask =
COMEDI_CB_EOA | COMEDI_CB_BLOCK | COMEDI_CB_ERROR | COMEDI_CB_EOA | COMEDI_CB_BLOCK | COMEDI_CB_ERROR |
......
...@@ -13,9 +13,10 @@ int insn_inval(struct comedi_device *dev, struct comedi_subdevice *s, ...@@ -13,9 +13,10 @@ int insn_inval(struct comedi_device *dev, struct comedi_subdevice *s,
int comedi_alloc_board_minor(struct device *hardware_device); int comedi_alloc_board_minor(struct device *hardware_device);
void comedi_free_board_minor(unsigned minor); void comedi_free_board_minor(unsigned minor);
int comedi_find_board_minor(struct device *hardware_device); int comedi_find_board_minor(struct device *hardware_device);
void comedi_reset_async_buf(struct comedi_async *async);
int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s, int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
unsigned long new_size); unsigned long new_size);
void comedi_buf_reset(struct comedi_async *async);
extern unsigned int comedi_default_buf_size_kb; extern unsigned int comedi_default_buf_size_kb;
extern unsigned int comedi_default_buf_maxsize_kb; extern unsigned int comedi_default_buf_maxsize_kb;
......
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