diff options
Diffstat (limited to 'drivers/staging/meilhaus/me0600_dio.c')
| -rw-r--r-- | drivers/staging/meilhaus/me0600_dio.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/meilhaus/me0600_dio.c b/drivers/staging/meilhaus/me0600_dio.c index 3a2775749a2c..d29303518bed 100644 --- a/drivers/staging/meilhaus/me0600_dio.c +++ b/drivers/staging/meilhaus/me0600_dio.c @@ -36,7 +36,7 @@ #include <linux/slab.h> #include <linux/spinlock.h> -#include <asm/io.h> +#include <linux/io.h> #include <linux/types.h> #include "medefines.h" @@ -91,7 +91,7 @@ static int me0600_dio_io_reset_subdevice(struct me_subdevice *subdevice, return ME_ERRNO_SUCCESS; } -static int me0600_dio_io_single_config(me_subdevice_t * subdevice, +static int me0600_dio_io_single_config(me_subdevice_t *subdevice, struct file *filep, int channel, int single_config, @@ -162,7 +162,7 @@ static int me0600_dio_io_single_config(me_subdevice_t * subdevice, return err; } -static int me0600_dio_io_single_read(me_subdevice_t * subdevice, +static int me0600_dio_io_single_read(me_subdevice_t *subdevice, struct file *filep, int channel, int *value, int time_out, int flags) @@ -242,7 +242,7 @@ static int me0600_dio_io_single_read(me_subdevice_t * subdevice, return err; } -static int me0600_dio_io_single_write(me_subdevice_t * subdevice, +static int me0600_dio_io_single_write(me_subdevice_t *subdevice, struct file *filep, int channel, int value, int time_out, int flags) @@ -329,7 +329,7 @@ static int me0600_dio_io_single_write(me_subdevice_t * subdevice, return err; } -static int me0600_dio_query_number_channels(me_subdevice_t * subdevice, +static int me0600_dio_query_number_channels(me_subdevice_t *subdevice, int *number) { PDEBUG("executed.\n"); @@ -337,7 +337,7 @@ static int me0600_dio_query_number_channels(me_subdevice_t * subdevice, return ME_ERRNO_SUCCESS; } -static int me0600_dio_query_subdevice_type(me_subdevice_t * subdevice, +static int me0600_dio_query_subdevice_type(me_subdevice_t *subdevice, int *type, int *subtype) { PDEBUG("executed.\n"); @@ -346,7 +346,7 @@ static int me0600_dio_query_subdevice_type(me_subdevice_t * subdevice, return ME_ERRNO_SUCCESS; } -static int me0600_dio_query_subdevice_caps(me_subdevice_t * subdevice, +static int me0600_dio_query_subdevice_caps(me_subdevice_t *subdevice, int *caps) { PDEBUG("executed.\n"); @@ -356,7 +356,7 @@ static int me0600_dio_query_subdevice_caps(me_subdevice_t * subdevice, me0600_dio_subdevice_t *me0600_dio_constructor(uint32_t reg_base, unsigned int dio_idx, - spinlock_t * ctrl_reg_lock) + spinlock_t *ctrl_reg_lock) { me0600_dio_subdevice_t *subdevice; int err; @@ -381,7 +381,7 @@ me0600_dio_subdevice_t *me0600_dio_constructor(uint32_t reg_base, kfree(subdevice); return NULL; } - // Initialize spin locks. + /* Initialize spin locks. */ spin_lock_init(&subdevice->subdevice_lock); subdevice->ctrl_reg_lock = ctrl_reg_lock; |