diff options
Diffstat (limited to 'drivers/staging/meilhaus/me8200_di.c')
-rw-r--r-- | drivers/staging/meilhaus/me8200_di.c | 58 |
1 files changed, 21 insertions, 37 deletions
diff --git a/drivers/staging/meilhaus/me8200_di.c b/drivers/staging/meilhaus/me8200_di.c index 27525bc..a931fb8 100644 --- a/drivers/staging/meilhaus/me8200_di.c +++ b/drivers/staging/meilhaus/me8200_di.c @@ -34,7 +34,7 @@ #include <linux/slab.h> #include <linux/spinlock.h> -#include <asm/io.h> +#include <linux/io.h> #include <linux/types.h> #include <linux/interrupt.h> #include <linux/version.h> @@ -50,52 +50,44 @@ /// Defines static void me8200_di_destructor(struct me_subdevice *subdevice); -static int me8200_di_io_irq_start(me_subdevice_t * subdevice, +static int me8200_di_io_irq_start(me_subdevice_t *subdevice, struct file *filep, int channel, int irq_source, int irq_edge, int irq_arg, int flags); -static int me8200_di_io_irq_wait(me_subdevice_t * subdevice, +static int me8200_di_io_irq_wait(me_subdevice_t *subdevice, struct file *filep, int channel, int *irq_count, int *value, int time_out, int flags); -static int me8200_di_io_irq_stop(me_subdevice_t * subdevice, +static int me8200_di_io_irq_stop(me_subdevice_t *subdevice, struct file *filep, int channel, int flags); -static int me8200_di_io_single_config(me_subdevice_t * subdevice, +static int me8200_di_io_single_config(me_subdevice_t *subdevice, struct file *filep, int channel, int single_config, int ref, int trig_chan, int trig_type, int trig_edge, int flags); -static int me8200_di_io_single_read(me_subdevice_t * subdevice, +static int me8200_di_io_single_read(me_subdevice_t *subdevice, struct file *filep, int channel, int *value, int time_out, int flags); static int me8200_di_io_reset_subdevice(struct me_subdevice *subdevice, struct file *filep, int flags); -static int me8200_di_query_number_channels(me_subdevice_t * subdevice, +static int me8200_di_query_number_channels(me_subdevice_t *subdevice, int *number); -static int me8200_di_query_subdevice_type(me_subdevice_t * subdevice, +static int me8200_di_query_subdevice_type(me_subdevice_t *subdevice, int *type, int *subtype); -static int me8200_di_query_subdevice_caps(me_subdevice_t * subdevice, +static int me8200_di_query_subdevice_caps(me_subdevice_t *subdevice, int *caps); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) static irqreturn_t me8200_isr(int irq, void *dev_id); -#else -static irqreturn_t me8200_isr(int irq, void *dev_id, struct pt_regs *regs); -#endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) static irqreturn_t me8200_isr_EX(int irq, void *dev_id); -#else -static irqreturn_t me8200_isr_EX(int irq, void *dev_id, struct pt_regs *regs); -#endif -static void me8200_di_check_version(me8200_di_subdevice_t * instance, +static void me8200_di_check_version(me8200_di_subdevice_t *instance, unsigned long addr); ///Functions -static int me8200_di_io_irq_start(me_subdevice_t * subdevice, +static int me8200_di_io_irq_start(me_subdevice_t *subdevice, struct file *filep, int channel, int irq_source, @@ -246,7 +238,7 @@ static int me8200_di_io_irq_start(me_subdevice_t * subdevice, return err; } -static int me8200_di_io_irq_wait(me_subdevice_t * subdevice, +static int me8200_di_io_irq_wait(me_subdevice_t *subdevice, struct file *filep, int channel, int *irq_count, @@ -352,7 +344,7 @@ static int me8200_di_io_irq_wait(me_subdevice_t * subdevice, return err; } -static int me8200_di_io_irq_stop(me_subdevice_t * subdevice, +static int me8200_di_io_irq_stop(me_subdevice_t *subdevice, struct file *filep, int channel, int flags) { me8200_di_subdevice_t *instance; @@ -406,7 +398,7 @@ static int me8200_di_io_irq_stop(me_subdevice_t * subdevice, return ME_ERRNO_SUCCESS; } -static int me8200_di_io_single_config(me_subdevice_t * subdevice, +static int me8200_di_io_single_config(me_subdevice_t *subdevice, struct file *filep, int channel, int single_config, @@ -453,7 +445,7 @@ static int me8200_di_io_single_config(me_subdevice_t * subdevice, return err; } -static int me8200_di_io_single_read(me_subdevice_t * subdevice, +static int me8200_di_io_single_read(me_subdevice_t *subdevice, struct file *filep, int channel, int *value, int time_out, int flags) @@ -518,7 +510,7 @@ static int me8200_di_io_reset_subdevice(struct me_subdevice *subdevice, return me8200_di_io_irq_stop(subdevice, filep, 0, 0); } -static int me8200_di_query_number_channels(me_subdevice_t * subdevice, +static int me8200_di_query_number_channels(me_subdevice_t *subdevice, int *number) { PDEBUG("executed.\n"); @@ -526,7 +518,7 @@ static int me8200_di_query_number_channels(me_subdevice_t * subdevice, return ME_ERRNO_SUCCESS; } -static int me8200_di_query_subdevice_type(me_subdevice_t * subdevice, +static int me8200_di_query_subdevice_type(me_subdevice_t *subdevice, int *type, int *subtype) { PDEBUG("executed.\n"); @@ -535,7 +527,7 @@ static int me8200_di_query_subdevice_type(me_subdevice_t * subdevice, return ME_ERRNO_SUCCESS; } -static int me8200_di_query_subdevice_caps(me_subdevice_t * subdevice, int *caps) +static int me8200_di_query_subdevice_caps(me_subdevice_t *subdevice, int *caps) { PDEBUG("executed.\n"); *caps = @@ -546,11 +538,7 @@ static int me8200_di_query_subdevice_caps(me_subdevice_t * subdevice, int *caps) return ME_ERRNO_SUCCESS; } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) static irqreturn_t me8200_isr(int irq, void *dev_id) -#else -static irqreturn_t me8200_isr(int irq, void *dev_id, struct pt_regs *regs) -#endif { me8200_di_subdevice_t *instance; uint8_t ctrl; @@ -629,11 +617,7 @@ static irqreturn_t me8200_isr(int irq, void *dev_id, struct pt_regs *regs) return IRQ_HANDLED; } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) static irqreturn_t me8200_isr_EX(int irq, void *dev_id) -#else -static irqreturn_t me8200_isr_EX(int irq, void *dev_id, struct pt_regs *regs) -#endif { me8200_di_subdevice_t *instance; uint8_t irq_status = 0; @@ -715,8 +699,8 @@ static void me8200_di_destructor(struct me_subdevice *subdevice) me8200_di_subdevice_t *me8200_di_constructor(uint32_t me8200_regbase, unsigned int di_idx, int irq, - spinlock_t * irq_ctrl_lock, - spinlock_t * irq_mode_lock) + spinlock_t *irq_ctrl_lock, + spinlock_t *irq_mode_lock) { me8200_di_subdevice_t *subdevice; int err; @@ -843,7 +827,7 @@ me8200_di_subdevice_t *me8200_di_constructor(uint32_t me8200_regbase, return subdevice; } -static void me8200_di_check_version(me8200_di_subdevice_t * instance, +static void me8200_di_check_version(me8200_di_subdevice_t *instance, unsigned long addr) { |