diff options
Diffstat (limited to 'drivers/staging/meilhaus/me0600_optoi.c')
| -rw-r--r-- | drivers/staging/meilhaus/me0600_optoi.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/meilhaus/me0600_optoi.c b/drivers/staging/meilhaus/me0600_optoi.c index b6d977f228ca..43f710ffd278 100644 --- a/drivers/staging/meilhaus/me0600_optoi.c +++ b/drivers/staging/meilhaus/me0600_optoi.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" @@ -68,7 +68,7 @@ static int me0600_optoi_io_reset_subdevice(struct me_subdevice *subdevice, return ME_ERRNO_SUCCESS; } -static int me0600_optoi_io_single_config(me_subdevice_t * subdevice, +static int me0600_optoi_io_single_config(me_subdevice_t *subdevice, struct file *filep, int channel, int single_config, @@ -118,7 +118,7 @@ static int me0600_optoi_io_single_config(me_subdevice_t * subdevice, return err; } -static int me0600_optoi_io_single_read(me_subdevice_t * subdevice, +static int me0600_optoi_io_single_read(me_subdevice_t *subdevice, struct file *filep, int channel, int *value, int time_out, int flags) @@ -169,7 +169,7 @@ static int me0600_optoi_io_single_read(me_subdevice_t * subdevice, return err; } -static int me0600_optoi_query_number_channels(me_subdevice_t * subdevice, +static int me0600_optoi_query_number_channels(me_subdevice_t *subdevice, int *number) { PDEBUG("executed.\n"); @@ -177,7 +177,7 @@ static int me0600_optoi_query_number_channels(me_subdevice_t * subdevice, return ME_ERRNO_SUCCESS; } -static int me0600_optoi_query_subdevice_type(me_subdevice_t * subdevice, +static int me0600_optoi_query_subdevice_type(me_subdevice_t *subdevice, int *type, int *subtype) { PDEBUG("executed.\n"); @@ -186,7 +186,7 @@ static int me0600_optoi_query_subdevice_type(me_subdevice_t * subdevice, return ME_ERRNO_SUCCESS; } -static int me0600_optoi_query_subdevice_caps(me_subdevice_t * subdevice, +static int me0600_optoi_query_subdevice_caps(me_subdevice_t *subdevice, int *caps) { PDEBUG("executed.\n"); @@ -219,7 +219,7 @@ me0600_optoi_subdevice_t *me0600_optoi_constructor(uint32_t reg_base) kfree(subdevice); return NULL; } - // Initialize spin locks. + /* Initialize spin locks. */ spin_lock_init(&subdevice->subdevice_lock); /* Save the subdevice index */ |