diff options
author | James Morris <jmorris@namei.org> | 2009-05-08 17:56:47 +1000 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-05-08 17:56:47 +1000 |
commit | d254117099d711f215e62427f55dfb8ebd5ad011 (patch) | |
tree | 0848ff8dd74314fec14a86497f8d288c86ba7c65 /drivers/staging/comedi/drivers/comedi_fc.c | |
parent | integrity: remove __setup auditing msgs (diff) | |
parent | NOMMU: Don't check vm_region::vm_start is page aligned in add_nommu_region() (diff) | |
download | linux-dev-d254117099d711f215e62427f55dfb8ebd5ad011.tar.xz linux-dev-d254117099d711f215e62427f55dfb8ebd5ad011.zip |
Merge branch 'master' into next
Diffstat (limited to 'drivers/staging/comedi/drivers/comedi_fc.c')
-rw-r--r-- | drivers/staging/comedi/drivers/comedi_fc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/comedi/drivers/comedi_fc.c b/drivers/staging/comedi/drivers/comedi_fc.c index cd74dbe5417d..9fa4cdc84d44 100644 --- a/drivers/staging/comedi/drivers/comedi_fc.c +++ b/drivers/staging/comedi/drivers/comedi_fc.c @@ -28,10 +28,10 @@ #include "comedi_fc.h" -static void increment_scan_progress(comedi_subdevice *subd, +static void increment_scan_progress(struct comedi_subdevice *subd, unsigned int num_bytes) { - comedi_async *async = subd->async; + struct comedi_async *async = subd->async; unsigned int scan_length = cfc_bytes_per_scan(subd); async->scan_progress += num_bytes; @@ -42,10 +42,10 @@ static void increment_scan_progress(comedi_subdevice *subd, } /* Writes an array of data points to comedi's buffer */ -unsigned int cfc_write_array_to_buffer(comedi_subdevice *subd, void *data, +unsigned int cfc_write_array_to_buffer(struct comedi_subdevice *subd, void *data, unsigned int num_bytes) { - comedi_async *async = subd->async; + struct comedi_async *async = subd->async; unsigned int retval; if (num_bytes == 0) @@ -67,10 +67,10 @@ unsigned int cfc_write_array_to_buffer(comedi_subdevice *subd, void *data, } EXPORT_SYMBOL(cfc_write_array_to_buffer); -unsigned int cfc_read_array_from_buffer(comedi_subdevice *subd, void *data, +unsigned int cfc_read_array_from_buffer(struct comedi_subdevice *subd, void *data, unsigned int num_bytes) { - comedi_async *async = subd->async; + struct comedi_async *async = subd->async; if (num_bytes == 0) return 0; @@ -85,7 +85,7 @@ unsigned int cfc_read_array_from_buffer(comedi_subdevice *subd, void *data, } EXPORT_SYMBOL(cfc_read_array_from_buffer); -unsigned int cfc_handle_events(comedi_device *dev, comedi_subdevice *subd) +unsigned int cfc_handle_events(struct comedi_device *dev, struct comedi_subdevice *subd) { unsigned int events = subd->async->events; |