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: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/comedi_buf.c b/drivers/staging/comedi/comedi_buf.c
index 2fc89816f10d78897808e035606bef3ccd9e5107..9392453918ead5bdda6c5bd175a519cc9a5519cd 100644 (file)
--- a/drivers/staging/comedi/comedi_buf.c
+++ b/drivers/staging/comedi/comedi_buf.c
@@ -140,7 +140,7 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
        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_count = 0;

diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 599e775241332b05a5ff14b3270970af940622a3..3e82ab9bc51be3899918cfcc928228345b0d25fb 100644 (file)
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -408,7 +408,7 @@ static void do_become_nonbusy(struct comedi_device *dev,
 
        comedi_set_subdevice_runflags(s, SRF_RUNNING, 0);
        if (async) {
-               comedi_reset_async_buf(async);
+               comedi_buf_reset(async);
                async->inttrig = NULL;
                kfree(async->cmd.chanlist);
                async->cmd.chanlist = NULL;
@@ -1338,7 +1338,7 @@ static int do_cmd_ioctl(struct comedi_device *dev,
                goto cleanup;
        }
 
-       comedi_reset_async_buf(async);
+       comedi_buf_reset(async);
 
        async->cb_mask =
            COMEDI_CB_EOA | COMEDI_CB_BLOCK | COMEDI_CB_ERROR |

diff --git a/drivers/staging/comedi/comedi_internal.h b/drivers/staging/comedi/comedi_internal.h
index e70ef0515d9afa671ab52958cc3984a653858c14..9e94f2deb3bee875c3859ec09e7aec47bec6149f 100644 (file)
--- a/drivers/staging/comedi/comedi_internal.h
+++ b/drivers/staging/comedi/comedi_internal.h
@@ -13,9 +13,10 @@ int insn_inval(struct comedi_device *dev, struct comedi_subdevice *s,
 int comedi_alloc_board_minor(struct device *hardware_device);
 void comedi_free_board_minor(unsigned minor);
 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,
                     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_maxsize_kb;