diff options
Diffstat (limited to 'drivers/staging/meilhaus/me8200_do.c')
-rw-r--r-- | drivers/staging/meilhaus/me8200_do.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/staging/meilhaus/me8200_do.c b/drivers/staging/meilhaus/me8200_do.c index eb04fdd39a5..40d536c71d5 100644 --- a/drivers/staging/meilhaus/me8200_do.c +++ b/drivers/staging/meilhaus/me8200_do.c @@ -37,7 +37,7 @@ #include <linux/slab.h> #include <linux/spinlock.h> #include <linux/interrupt.h> -#include <asm/io.h> +#include <linux/io.h> #include <linux/types.h> #include <linux/version.h> @@ -59,7 +59,7 @@ * Functions */ -static int me8200_do_io_irq_start(me_subdevice_t * subdevice, +static int me8200_do_io_irq_start(me_subdevice_t *subdevice, struct file *filep, int channel, int irq_source, @@ -109,7 +109,7 @@ static int me8200_do_io_irq_start(me_subdevice_t * subdevice, return err; } -static int me8200_do_io_irq_wait(me_subdevice_t * subdevice, +static int me8200_do_io_irq_wait(me_subdevice_t *subdevice, struct file *filep, int channel, int *irq_count, @@ -184,7 +184,7 @@ static int me8200_do_io_irq_wait(me_subdevice_t * subdevice, return err; } -static int me8200_do_io_irq_stop(me_subdevice_t * subdevice, +static int me8200_do_io_irq_stop(me_subdevice_t *subdevice, struct file *filep, int channel, int flags) { me8200_do_subdevice_t *instance; @@ -262,7 +262,7 @@ static int me8200_do_io_reset_subdevice(struct me_subdevice *subdevice, return ME_ERRNO_SUCCESS; } -static int me8200_do_io_single_config(me_subdevice_t * subdevice, +static int me8200_do_io_single_config(me_subdevice_t *subdevice, struct file *filep, int channel, int single_config, @@ -307,7 +307,7 @@ static int me8200_do_io_single_config(me_subdevice_t * subdevice, return err; } -static int me8200_do_io_single_read(me_subdevice_t * subdevice, +static int me8200_do_io_single_read(me_subdevice_t *subdevice, struct file *filep, int channel, int *value, int time_out, int flags) @@ -354,7 +354,7 @@ static int me8200_do_io_single_read(me_subdevice_t * subdevice, return err; } -static int me8200_do_io_single_write(me_subdevice_t * subdevice, +static int me8200_do_io_single_write(me_subdevice_t *subdevice, struct file *filep, int channel, int value, int time_out, int flags) @@ -415,7 +415,7 @@ static int me8200_do_io_single_write(me_subdevice_t * subdevice, return err; } -static int me8200_do_query_number_channels(me_subdevice_t * subdevice, +static int me8200_do_query_number_channels(me_subdevice_t *subdevice, int *number) { PDEBUG("executed.\n"); @@ -423,7 +423,7 @@ static int me8200_do_query_number_channels(me_subdevice_t * subdevice, return ME_ERRNO_SUCCESS; } -static int me8200_do_query_subdevice_type(me_subdevice_t * subdevice, +static int me8200_do_query_subdevice_type(me_subdevice_t *subdevice, int *type, int *subtype) { PDEBUG("executed.\n"); @@ -432,7 +432,7 @@ static int me8200_do_query_subdevice_type(me_subdevice_t * subdevice, return ME_ERRNO_SUCCESS; } -static int me8200_do_query_subdevice_caps(me_subdevice_t * subdevice, int *caps) +static int me8200_do_query_subdevice_caps(me_subdevice_t *subdevice, int *caps) { PDEBUG("executed.\n"); *caps = ME_CAPS_DIO_OVER_TEMP_IRQ; @@ -501,7 +501,7 @@ static irqreturn_t me8200_do_isr(int irq, void *dev_id) me8200_do_subdevice_t *me8200_do_constructor(uint32_t reg_base, unsigned int do_idx, int irq, - spinlock_t * irq_mode_lock) + spinlock_t *irq_mode_lock) { me8200_do_subdevice_t *subdevice; int err; |