diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-05-17 18:18:01 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-17 19:09:50 (GMT) |
| commit | d569541e537e13136fc775a902cda06f4c48bbe1 (patch) | |
| tree | 1be37af8602e082c8a29391255e478aa41949a48 /drivers/staging/comedi/comedidev.h | |
| parent | cb43cc0f031563e09820360f215c16a4582a2618 (diff) | |
| download | linux-fsl-qoriq-d569541e537e13136fc775a902cda06f4c48bbe1.tar.xz | |
staging: comedi: ni_pcidio: use comedi_load_firmware()
Use comedi_load_firmware() instead of duplicating the code in a
private function.
This driver loads multiple firmware images to the device. Modify
comedi_load_firmware() to take a 'context' that is passed to the
firmware upload callback function.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/comedidev.h')
| -rw-r--r-- | drivers/staging/comedi/comedidev.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h index 7adc426..a31915f 100644 --- a/drivers/staging/comedi/comedidev.h +++ b/drivers/staging/comedi/comedidev.h @@ -349,7 +349,9 @@ void comedi_spriv_free(struct comedi_device *, int subdev_num); int comedi_load_firmware(struct comedi_device *, struct device *, const char *name, int (*cb)(struct comedi_device *, - const u8 *data, size_t size)); + const u8 *data, size_t size, + unsigned long context), + unsigned long context); int __comedi_request_region(struct comedi_device *, unsigned long start, unsigned long len); |