diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-03-20 15:38:05 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-03-20 15:38:05 +1100 |
commit | debd9c0359e33f23ef54533d370b03516d54d4a5 (patch) | |
tree | 268bc28ce02382c58aa6a14b0f1012c839696ca7 /drivers/staging/meilhaus/medevice.c | |
parent | c2ced7afe298f12721337baee6b10cbc56da5c8b (diff) | |
parent | 5e2d7851a34c18f03ed2fd1c0784a54dca44460c (diff) |
Merge branch 'quilt/staging'
Conflicts:
drivers/gpu/drm/Makefile
Diffstat (limited to 'drivers/staging/meilhaus/medevice.c')
-rw-r--r-- | drivers/staging/meilhaus/medevice.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/meilhaus/medevice.c b/drivers/staging/meilhaus/medevice.c index 8f62e16c7a37..75aaec0f681b 100644 --- a/drivers/staging/meilhaus/medevice.c +++ b/drivers/staging/meilhaus/medevice.c @@ -390,9 +390,9 @@ static int me_device_io_single_write(struct me_device *device, static int me_device_io_stream_config(struct me_device *device, struct file *filep, int subdevice, - meIOStreamConfig_t * config_list, + meIOStreamConfig_t *config_list, int count, - meIOStreamTrigger_t * trigger, + meIOStreamTrigger_t *trigger, int fifo_irq_threshold, int flags) { int err = ME_ERRNO_SUCCESS; @@ -1040,7 +1040,7 @@ static int me_device_query_timer(struct me_device *device, int subdevice, int timer, int *base_frequency, - uint64_t * min_ticks, uint64_t * max_ticks) + uint64_t *min_ticks, uint64_t *max_ticks) { int err = ME_ERRNO_SUCCESS; me_subdevice_t *s; @@ -1082,14 +1082,14 @@ static int me_device_query_version_device_driver(struct me_device *device, } static int me_device_config_load(struct me_device *device, struct file *filep, - me_cfg_device_entry_t * config) + me_cfg_device_entry_t *config) { PDEBUG("executed.\n"); return ME_ERRNO_SUCCESS; //If no need for config return success. // return ME_ERRNO_NOT_SUPPORTED; } -static void me_device_destructor(me_device_t * me_device) +static void me_device_destructor(me_device_t *me_device) { PDEBUG("executed.\n"); me_device_deinit(me_device); @@ -1581,7 +1581,7 @@ static int get_device_descriptions(uint16_t device_id, return 0; } -int me_device_pci_init(me_device_t * me_device, struct pci_dev *pci_device) +int me_device_pci_init(me_device_t *me_device, struct pci_dev *pci_device) { int err; int i; @@ -1720,7 +1720,7 @@ int me_device_pci_init(me_device_t * me_device, struct pci_dev *pci_device) return 1; } -void me_device_deinit(me_device_t * me_device) +void me_device_deinit(me_device_t *me_device) { PDEBUG("executed.\n"); |