diff options
Diffstat (limited to 'drivers/staging/meilhaus/me8100_do.c')
| -rw-r--r-- | drivers/staging/meilhaus/me8100_do.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/meilhaus/me8100_do.c b/drivers/staging/meilhaus/me8100_do.c index 957b9f92f760..81651a90cc05 100644 --- a/drivers/staging/meilhaus/me8100_do.c +++ b/drivers/staging/meilhaus/me8100_do.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" @@ -92,7 +92,7 @@ static int me8100_do_io_reset_subdevice(struct me_subdevice *subdevice, return ME_ERRNO_SUCCESS; } -static int me8100_do_io_single_config(me_subdevice_t * subdevice, +static int me8100_do_io_single_config(me_subdevice_t *subdevice, struct file *filep, int channel, int single_config, @@ -158,7 +158,7 @@ static int me8100_do_io_single_config(me_subdevice_t * subdevice, return err; } -static int me8100_do_io_single_read(me_subdevice_t * subdevice, +static int me8100_do_io_single_read(me_subdevice_t *subdevice, struct file *filep, int channel, int *value, int time_out, int flags) @@ -215,7 +215,7 @@ static int me8100_do_io_single_read(me_subdevice_t * subdevice, return err; } -static int me8100_do_io_single_write(me_subdevice_t * subdevice, +static int me8100_do_io_single_write(me_subdevice_t *subdevice, struct file *filep, int channel, int value, int time_out, int flags) @@ -297,7 +297,7 @@ static int me8100_do_io_single_write(me_subdevice_t * subdevice, return err; } -static int me8100_do_query_number_channels(me_subdevice_t * subdevice, +static int me8100_do_query_number_channels(me_subdevice_t *subdevice, int *number) { PDEBUG("executed.\n"); @@ -305,7 +305,7 @@ static int me8100_do_query_number_channels(me_subdevice_t * subdevice, return ME_ERRNO_SUCCESS; } -static int me8100_do_query_subdevice_type(me_subdevice_t * subdevice, +static int me8100_do_query_subdevice_type(me_subdevice_t *subdevice, int *type, int *subtype) { PDEBUG("executed.\n"); @@ -314,7 +314,7 @@ static int me8100_do_query_subdevice_type(me_subdevice_t * subdevice, return ME_ERRNO_SUCCESS; } -static int me8100_do_query_subdevice_caps(me_subdevice_t * subdevice, int *caps) +static int me8100_do_query_subdevice_caps(me_subdevice_t *subdevice, int *caps) { PDEBUG("executed.\n"); *caps = ME_CAPS_DIO_SINK_SOURCE; @@ -323,7 +323,7 @@ static int me8100_do_query_subdevice_caps(me_subdevice_t * subdevice, int *caps) me8100_do_subdevice_t *me8100_do_constructor(uint32_t reg_base, unsigned int do_idx, - spinlock_t * ctrl_reg_lock) + spinlock_t *ctrl_reg_lock) { me8100_do_subdevice_t *subdevice; int err; |