diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 11:06:45 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 11:06:45 -0700 |
commit | 3516c6a8dc0b1153c611c4cf0dc4a51631f052bb (patch) | |
tree | c54a5fc916cbe73e43dee20902642f367f44a551 /drivers/staging/meilhaus/mesubdevice.c | |
parent | 714f83d5d9f7c785f622259dad1f4fad12d64664 (diff) | |
parent | ba0e1ebb7ea0616eebc29d2077355bacea62a9d8 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (714 commits)
Staging: sxg: slicoss: Specify the license for Sahara SXG and Slicoss drivers
Staging: serqt_usb: fix build due to proc tty changes
Staging: serqt_usb: fix checkpatch errors
Staging: serqt_usb: add TODO file
Staging: serqt_usb: Lindent the code
Staging: add USB serial Quatech driver
staging: document that the wifi staging drivers a bit better
Staging: echo cleanup
Staging: BUG to BUG_ON changes
Staging: remove some pointless conditionals before kfree_skb()
Staging: line6: fix build error, select SND_RAWMIDI
Staging: line6: fix checkpatch errors in variax.c
Staging: line6: fix checkpatch errors in toneport.c
Staging: line6: fix checkpatch errors in pcm.c
Staging: line6: fix checkpatch errors in midibuf.c
Staging: line6: fix checkpatch errors in midi.c
Staging: line6: fix checkpatch errors in dumprequest.c
Staging: line6: fix checkpatch errors in driver.c
Staging: line6: fix checkpatch errors in audio.c
Staging: line6: fix checkpatch errors in pod.c
...
Diffstat (limited to 'drivers/staging/meilhaus/mesubdevice.c')
-rw-r--r-- | drivers/staging/meilhaus/mesubdevice.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/meilhaus/mesubdevice.c b/drivers/staging/meilhaus/mesubdevice.c index 98d4f1f7a82..b2e956726b5 100644 --- a/drivers/staging/meilhaus/mesubdevice.c +++ b/drivers/staging/meilhaus/mesubdevice.c @@ -101,9 +101,9 @@ static int me_subdevice_io_single_write(struct me_subdevice *subdevice, static int me_subdevice_io_stream_config(struct me_subdevice *subdevice, struct file *filep, - meIOStreamConfig_t * config_list, + meIOStreamConfig_t *config_list, int count, - meIOStreamTrigger_t * trigger, + meIOStreamTrigger_t *trigger, int fifo_irq_threshold, int flags) { PDEBUG("executed.\n"); @@ -162,7 +162,7 @@ static int me_subdevice_io_stream_write(struct me_subdevice *subdevice, return ME_ERRNO_NOT_SUPPORTED; } -static int me_subdevice_lock_subdevice(me_subdevice_t * subdevice, +static int me_subdevice_lock_subdevice(me_subdevice_t *subdevice, struct file *filep, int lock, int flags) { PDEBUG("executed.\n"); @@ -235,7 +235,7 @@ static int me_subdevice_query_timer(struct me_subdevice *subdevice, } static int me_subdevice_config_load(struct me_subdevice *subdevice, - me_cfg_device_entry_t * config) + me_cfg_device_entry_t *config) { PDEBUG("executed.\n"); return ME_ERRNO_SUCCESS; @@ -248,7 +248,7 @@ static void me_subdevice_destructor(struct me_subdevice *subdevice) kfree(subdevice); } -int me_subdevice_init(me_subdevice_t * subdevice) +int me_subdevice_init(me_subdevice_t *subdevice) { int err; @@ -308,7 +308,7 @@ int me_subdevice_init(me_subdevice_t * subdevice) return 0; } -void me_subdevice_deinit(me_subdevice_t * subdevice) +void me_subdevice_deinit(me_subdevice_t *subdevice) { PDEBUG("executed.\n"); me_subdevice_io_reset_subdevice(subdevice, NULL, |