Staging: meilhaus: some checkpatch.pl cleanup
PATCH 1/1 Staging: meilhaus: some checkpatch.pl cleanup
Signed-off-by Alexander Beregalov <[email protected]>
---
drivers/staging/meilhaus/me0600_device.c | 4 +- drivers/staging/meilhaus/me0600_dio.c | 18 ++-- drivers/staging/meilhaus/me0600_ext_irq.c | 4 +- drivers/staging/meilhaus/me0600_optoi.c | 14 ++-- drivers/staging/meilhaus/me0600_relay.c | 14 ++-- drivers/staging/meilhaus/me0600_ttli.c | 12 +- drivers/staging/meilhaus/me0900_device.c | 4 +- drivers/staging/meilhaus/me0900_di.c | 12 +- drivers/staging/meilhaus/me0900_do.c | 14 ++-- drivers/staging/meilhaus/me1000_device.c | 8 +- drivers/staging/meilhaus/me1000_dio.c | 4 +- drivers/staging/meilhaus/me1400_device.c | 4 +- drivers/staging/meilhaus/me1400_ext_irq.c | 2 +- drivers/staging/meilhaus/me1600_ao.c | 49 +++++----- drivers/staging/meilhaus/me1600_device.c | 8 +- drivers/staging/meilhaus/me4600_ai.c | 132 +++++++++++++------------- drivers/staging/meilhaus/me4600_ao.c | 148 ++++++++++++++-------------- drivers/staging/meilhaus/me4600_device.c | 4 +- drivers/staging/meilhaus/me4600_di.c | 14 ++-- drivers/staging/meilhaus/me4600_dio.c | 16 ++-- drivers/staging/meilhaus/me4600_do.c | 16 ++-- drivers/staging/meilhaus/me4600_ext_irq.c | 16 ++-- drivers/staging/meilhaus/me6000_ao.c | 106 ++++++++++---------- drivers/staging/meilhaus/me6000_device.c | 4 +- drivers/staging/meilhaus/me6000_dio.c | 16 ++-- drivers/staging/meilhaus/me8100_device.c | 4 +- drivers/staging/meilhaus/me8100_di.c | 20 ++-- drivers/staging/meilhaus/me8100_do.c | 16 ++-- drivers/staging/meilhaus/me8200_device.c | 4 +- drivers/staging/meilhaus/me8200_di.c | 42 ++++---- drivers/staging/meilhaus/me8200_dio.c | 16 ++-- drivers/staging/meilhaus/me8200_do.c | 22 ++-- drivers/staging/meilhaus/me8254.c | 14 ++-- drivers/staging/meilhaus/me8255.c | 4 +- drivers/staging/meilhaus/mecirc_buf.h | 16 ++-- drivers/staging/meilhaus/medevice.c | 14 ++-- drivers/staging/meilhaus/medlist.c | 6 +- drivers/staging/meilhaus/medlock.c | 4 +- drivers/staging/meilhaus/medummy.c | 84 ++++++++--------- drivers/staging/meilhaus/memain.c | 32 +++---- drivers/staging/meilhaus/meslist.c | 6 +- drivers/staging/meilhaus/meslock.c | 2 +- drivers/staging/meilhaus/mesubdevice.c | 12 +- drivers/staging/meilhaus/metempl_device.c | 4 +- drivers/staging/meilhaus/metempl_sub.c | 10 +- 45 files changed, 474 insertions(+), 501 deletions(-)
drivers/staging/meilhaus/me0600_device.c +1 -3
@@ -186,6 +186,7 @@ me_device_t *me0600_pci_constructor(struct pci_dev *pci_device)return (me_device_t *) me0600_device; } +EXPORT_SYMBOL (me0600_pci_constructor);// Init and exit of module.
@@ -210,6 +211,3 @@ MODULE_AUTHORMODULE_DESCRIPTION ("Device Driver Module for ME-6xx Device" );MODULE_SUPPORTED_DEVICE ("Meilhaus ME-6xx Devices" );MODULE_LICENSE ("GPL" ); - -// Export the constructor. -EXPORT_SYMBOL (me0600_pci_constructor);
drivers/staging/meilhaus/me0600_dio.c +9 -9
@@ -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;
drivers/staging/meilhaus/me0600_ext_irq.c +2 -2
@@ -37,7 +37,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>
@@ -393,7 +393,7 @@ static irqreturn_t me0600_isr(int irq, void *dev_id)me0600_ext_irq_subdevice_t *me0600_ext_irq_constructor (uint32_t plx_reg_base,uint32_t me0600_reg_base, -spinlock_t * intcsr_lock, +spinlock_t *intcsr_lock,unsigned ext_irq_idx,int irq) {
drivers/staging/meilhaus/me0600_optoi.c +7 -7
@@ -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 */
drivers/staging/meilhaus/me0600_relay.c +7 -7
@@ -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"
@@ -85,7 +85,7 @@ static int me0600_relay_io_reset_subdevice(struct me_subdevice *subdevice,return ME_ERRNO_SUCCESS ; } -static int me0600_relay_io_single_config(me_subdevice_t * subdevice, +static int me0600_relay_io_single_config(me_subdevice_t *subdevice, struct file *filep, int channel, int single_config,
@@ -135,7 +135,7 @@ static int me0600_relay_io_single_config(me_subdevice_t * subdevice,return err; } -static int me0600_relay_io_single_read (me_subdevice_t * subdevice, +static int me0600_relay_io_single_read (me_subdevice_t *subdevice,struct file *filep,int channel,int *value,int time_out,int flags)
@@ -203,7 +203,7 @@ static int me0600_relay_io_single_read(me_subdevice_t * subdevice,return err; } -static int me0600_relay_io_single_write (me_subdevice_t * subdevice, +static int me0600_relay_io_single_write (me_subdevice_t *subdevice,struct file *filep,int channel,int value,int time_out,int flags)
@@ -279,7 +279,7 @@ static int me0600_relay_io_single_write(me_subdevice_t * subdevice,return err; } -static int me0600_relay_query_number_channels (me_subdevice_t * subdevice, +static int me0600_relay_query_number_channels (me_subdevice_t *subdevice,int *number) {PDEBUG ("executed.\n" );
@@ -287,7 +287,7 @@ static int me0600_relay_query_number_channels(me_subdevice_t * subdevice,return ME_ERRNO_SUCCESS ; } -static int me0600_relay_query_subdevice_type (me_subdevice_t * subdevice, +static int me0600_relay_query_subdevice_type (me_subdevice_t *subdevice,int *type,int *subtype) {PDEBUG ("executed.\n" );
@@ -296,7 +296,7 @@ static int me0600_relay_query_subdevice_type(me_subdevice_t * subdevice,return ME_ERRNO_SUCCESS ; } -static int me0600_relay_query_subdevice_caps (me_subdevice_t * subdevice, +static int me0600_relay_query_subdevice_caps (me_subdevice_t *subdevice,int *caps) {PDEBUG ("executed.\n" );
drivers/staging/meilhaus/me0600_ttli.c +6 -6
@@ -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"
@@ -67,7 +67,7 @@ static int me0600_ttli_io_reset_subdevice(struct me_subdevice *subdevice,return ME_ERRNO_SUCCESS ; } -static int me0600_ttli_io_single_config(me_subdevice_t * subdevice, +static int me0600_ttli_io_single_config(me_subdevice_t *subdevice, struct file *filep, int channel, int single_config,
@@ -116,7 +116,7 @@ static int me0600_ttli_io_single_config(me_subdevice_t * subdevice,return err; } -static int me0600_ttli_io_single_read (me_subdevice_t * subdevice, +static int me0600_ttli_io_single_read (me_subdevice_t *subdevice,struct file *filep,int channel,int *value,int time_out,int flags)
@@ -164,7 +164,7 @@ static int me0600_ttli_io_single_read(me_subdevice_t * subdevice,return err; } -static int me0600_ttli_query_number_channels (me_subdevice_t * subdevice, +static int me0600_ttli_query_number_channels (me_subdevice_t *subdevice,int *number) {PDEBUG ("executed.\n" );
@@ -172,7 +172,7 @@ static int me0600_ttli_query_number_channels(me_subdevice_t * subdevice,return ME_ERRNO_SUCCESS ; } -static int me0600_ttli_query_subdevice_type (me_subdevice_t * subdevice, +static int me0600_ttli_query_subdevice_type (me_subdevice_t *subdevice,int *type,int *subtype) {PDEBUG ("executed.\n" );
@@ -181,7 +181,7 @@ static int me0600_ttli_query_subdevice_type(me_subdevice_t * subdevice,return ME_ERRNO_SUCCESS ; } -static int me0600_ttli_query_subdevice_caps (me_subdevice_t * subdevice, +static int me0600_ttli_query_subdevice_caps (me_subdevice_t *subdevice,int *caps) {PDEBUG ("executed.\n" );
drivers/staging/meilhaus/me0900_device.c +1 -3
@@ -152,6 +152,7 @@ me_device_t *me0900_pci_constructor(struct pci_dev *pci_device)return (me_device_t *) me0900_device; } +EXPORT_SYMBOL (me0900_pci_constructor);// Init and exit of module.
@@ -175,6 +176,3 @@ MODULE_AUTHORMODULE_DESCRIPTION ("Device Driver Module for ME-9x Device" );MODULE_SUPPORTED_DEVICE ("Meilhaus ME-9x Devices" );MODULE_LICENSE ("GPL" ); - -// Export the constructor. -EXPORT_SYMBOL (me0900_pci_constructor);
drivers/staging/meilhaus/me0900_di.c +6 -6
@@ -35,7 +35,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>
@@ -71,7 +71,7 @@ static int me0900_di_io_reset_subdevice(struct me_subdevice *subdevice,return ME_ERRNO_SUCCESS ; } -static int me0900_di_io_single_config(me_subdevice_t * subdevice, +static int me0900_di_io_single_config(me_subdevice_t *subdevice, struct file *filep, int channel, int single_config,
@@ -115,7 +115,7 @@ static int me0900_di_io_single_config(me_subdevice_t * subdevice,return err; } -static int me0900_di_io_single_read (me_subdevice_t * subdevice, +static int me0900_di_io_single_read (me_subdevice_t *subdevice,struct file *filep,int channel,int *value,int time_out,int flags)
@@ -161,7 +161,7 @@ static int me0900_di_io_single_read(me_subdevice_t * subdevice,return err; } -static int me0900_di_query_number_channels (me_subdevice_t * subdevice, +static int me0900_di_query_number_channels (me_subdevice_t *subdevice,int *number) {PDEBUG ("executed.\n" );
@@ -169,7 +169,7 @@ static int me0900_di_query_number_channels(me_subdevice_t * subdevice,return ME_ERRNO_SUCCESS ; } -static int me0900_di_query_subdevice_type (me_subdevice_t * subdevice, +static int me0900_di_query_subdevice_type (me_subdevice_t *subdevice,int *type,int *subtype) {PDEBUG ("executed.\n" );
@@ -178,7 +178,7 @@ static int me0900_di_query_subdevice_type(me_subdevice_t * subdevice,return ME_ERRNO_SUCCESS ; } -static int me0900_di_query_subdevice_caps (me_subdevice_t * subdevice,int *caps) +static int me0900_di_query_subdevice_caps (me_subdevice_t *subdevice,int *caps) {PDEBUG ("executed.\n" ); *caps =0 ;
drivers/staging/meilhaus/me0900_do.c +7 -7
@@ -35,7 +35,7 @@#include <linux/slab.h> #include <linux/spinlock.h> -#include <asm/io.h> +#include <linux/io.h> #include <linux/types.h> #include "medefines.h"
@@ -81,7 +81,7 @@ static int me0900_do_io_reset_subdevice(struct me_subdevice *subdevice,return ME_ERRNO_SUCCESS ; } -static int me0900_do_io_single_config(me_subdevice_t * subdevice, +static int me0900_do_io_single_config(me_subdevice_t *subdevice, struct file *filep, int channel, int single_config,
@@ -125,7 +125,7 @@ static int me0900_do_io_single_config(me_subdevice_t * subdevice,return err; } -static int me0900_do_io_single_read (me_subdevice_t * subdevice, +static int me0900_do_io_single_read (me_subdevice_t *subdevice,struct file *filep,int channel,int *value,int time_out,int flags)
@@ -171,7 +171,7 @@ static int me0900_do_io_single_read(me_subdevice_t * subdevice,return err; } -static int me0900_do_io_single_write (me_subdevice_t * subdevice, +static int me0900_do_io_single_write (me_subdevice_t *subdevice,struct file *filep,int channel,int value,int time_out,int flags)
@@ -223,7 +223,7 @@ static int me0900_do_io_single_write(me_subdevice_t * subdevice,return err; } -static int me0900_do_query_number_channels (me_subdevice_t * subdevice, +static int me0900_do_query_number_channels (me_subdevice_t *subdevice,int *number) {PDEBUG ("executed.\n" );
@@ -231,7 +231,7 @@ static int me0900_do_query_number_channels(me_subdevice_t * subdevice,return ME_ERRNO_SUCCESS ; } -static int me0900_do_query_subdevice_type (me_subdevice_t * subdevice, +static int me0900_do_query_subdevice_type (me_subdevice_t *subdevice,int *type,int *subtype) {PDEBUG ("executed.\n" );
@@ -240,7 +240,7 @@ static int me0900_do_query_subdevice_type(me_subdevice_t * subdevice,return ME_ERRNO_SUCCESS ; } -static int me0900_do_query_subdevice_caps (me_subdevice_t * subdevice,int *caps) +static int me0900_do_query_subdevice_caps (me_subdevice_t *subdevice,int *caps) {PDEBUG ("executed.\n" ); *caps =0 ;
drivers/staging/meilhaus/me1000_device.c +3 -5
@@ -49,8 +49,8 @@#include "mesubdevice.h" #include "me1000_dio.h" -static int me1000_config_load (me_device_t * me_device,struct file *filep, -me_cfg_device_entry_t * config) +static int me1000_config_load (me_device_t *me_device,struct file *filep, +me_cfg_device_entry_t *config) {me1000_device_t *me1000_device;me1000_dio_subdevice_t *dio;
@@ -181,6 +181,7 @@ me_device_t *me1000_pci_constructor(struct pci_dev * pci_device)return (me_device_t *) me1000_device; } +EXPORT_SYMBOL (me1000_pci_constructor);// Init and exit of module. static int __init me1000_init (void )
@@ -203,6 +204,3 @@ MODULE_AUTHORMODULE_DESCRIPTION ("Device Driver Module for Meilhaus ME-1000 Devices" );MODULE_SUPPORTED_DEVICE ("Meilhaus ME-1000 Digital I/O Devices" );MODULE_LICENSE ("GPL" ); - -// Export the constructor. -EXPORT_SYMBOL (me1000_pci_constructor);
drivers/staging/meilhaus/me1000_dio.c +2 -2
@@ -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"
@@ -371,7 +371,7 @@ static int me1000_dio_query_subdevice_caps(struct me_subdevice *subdevice,me1000_dio_subdevice_t *me1000_dio_constructor (uint32_t reg_base,unsigned int dio_idx, -spinlock_t * ctrl_reg_lock) +spinlock_t *ctrl_reg_lock) {me1000_dio_subdevice_t *subdevice;int err;
drivers/staging/meilhaus/me1400_device.c +1 -3
@@ -228,6 +228,7 @@ me_device_t *me1400_pci_constructor(struct pci_dev *pci_device)return (me_device_t *) me1400_device; } +EXPORT_SYMBOL (me1400_pci_constructor);// Init and exit of module.
@@ -251,6 +252,3 @@ MODULE_AUTHORMODULE_DESCRIPTION ("Device Driver Module for Meilhaus ME-14xx devices" );MODULE_SUPPORTED_DEVICE ("Meilhaus ME-14xx MIO devices" );MODULE_LICENSE ("GPL" ); - -// Export the constructor. -EXPORT_SYMBOL (me1400_pci_constructor);
drivers/staging/meilhaus/me1400_ext_irq.c +1 -1
@@ -37,7 +37,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>
drivers/staging/meilhaus/me1600_ao.c +24 -25
141 lines not on this page · raw message
drivers/staging/meilhaus/me1600_device.c +3 -5
@@ -48,7 +48,7 @@#include "mesubdevice.h" #include "me1600_device.h" -static void me1600_set_registry (me1600_device_t * subdevice,uint32_t reg_base); +static void me1600_set_registry (me1600_device_t *subdevice,uint32_t reg_base);static void me1600_destructor (struct me_device *device);/**
@@ -142,6 +142,7 @@ me_device_t *me1600_pci_constructor(struct pci_dev *pci_device)return (me_device_t *) me1600_device; } +EXPORT_SYMBOL (me1600_pci_constructor);static void me1600_destructor (struct me_device *device) {
@@ -157,7 +158,7 @@ static void me1600_destructor(struct me_device *device)kfree (me1600_device); } -static void me1600_set_registry (me1600_device_t * subdevice,uint32_t reg_base) +static void me1600_set_registry (me1600_device_t *subdevice,uint32_t reg_base) {// Create shadow structure. if (subdevice->ao_regs_shadows.count >=1 ) { subdevice->ao_regs_shadows.registry[0] =
@@ -256,6 +257,3 @@ MODULE_AUTHORMODULE_DESCRIPTION ("Device Driver Module for ME-1600 Device" );MODULE_SUPPORTED_DEVICE ("Meilhaus ME-1600 Devices" );MODULE_LICENSE ("GPL" ); - -// Export the constructor. -EXPORT_SYMBOL (me1600_pci_constructor);
drivers/staging/meilhaus/me4600_ai.c +66 -66
415 lines not on this page · raw message
drivers/staging/meilhaus/me4600_ao.c +74 -74
511 lines not on this page · raw message
drivers/staging/meilhaus/me4600_device.c +1 -3
@@ -336,6 +336,7 @@ me_device_t *me4600_pci_constructor(struct pci_dev *pci_device)return (me_device_t *) me4600_device; } +EXPORT_SYMBOL (me4600_pci_constructor);// Init and exit of module.
@@ -368,6 +369,3 @@ MODULE_AUTHORMODULE_DESCRIPTION ("Device Driver Module for ME-46xx Devices" );MODULE_SUPPORTED_DEVICE ("Meilhaus ME-46xx Devices" );MODULE_LICENSE ("GPL" ); - -// Export the constructor. -EXPORT_SYMBOL (me4600_pci_constructor);
drivers/staging/meilhaus/me4600_di.c +7 -7
@@ -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 me4600_di_io_reset_subdevice(struct me_subdevice *subdevice,return ME_ERRNO_SUCCESS ; } -static int me4600_di_io_single_config(me_subdevice_t * subdevice, +static int me4600_di_io_single_config(me_subdevice_t *subdevice, struct file *filep, int channel, int single_config,
@@ -133,7 +133,7 @@ static int me4600_di_io_single_config(me_subdevice_t * subdevice,return err; } -static int me4600_di_io_single_read (me_subdevice_t * subdevice, +static int me4600_di_io_single_read (me_subdevice_t *subdevice,struct file *filep,int channel,int *value,int time_out,int flags)
@@ -177,7 +177,7 @@ static int me4600_di_io_single_read(me_subdevice_t * subdevice,return err; } -static int me4600_di_query_number_channels (me_subdevice_t * subdevice, +static int me4600_di_query_number_channels (me_subdevice_t *subdevice,int *number) {PDEBUG ("executed.\n" );
@@ -185,7 +185,7 @@ static int me4600_di_query_number_channels(me_subdevice_t * subdevice,return ME_ERRNO_SUCCESS ; } -static int me4600_di_query_subdevice_type (me_subdevice_t * subdevice, +static int me4600_di_query_subdevice_type (me_subdevice_t *subdevice,int *type,int *subtype) {PDEBUG ("executed.\n" );
@@ -194,7 +194,7 @@ static int me4600_di_query_subdevice_type(me_subdevice_t * subdevice,return ME_ERRNO_SUCCESS ; } -static int me4600_di_query_subdevice_caps (me_subdevice_t * subdevice,int *caps) +static int me4600_di_query_subdevice_caps (me_subdevice_t *subdevice,int *caps) {PDEBUG ("executed.\n" ); *caps =0 ;
@@ -202,7 +202,7 @@ static int me4600_di_query_subdevice_caps(me_subdevice_t * subdevice, int *caps) }me4600_di_subdevice_t *me4600_di_constructor (uint32_t reg_base, -spinlock_t * ctrl_reg_lock) +spinlock_t *ctrl_reg_lock) {me4600_di_subdevice_t *subdevice;int err;
drivers/staging/meilhaus/me4600_dio.c +8 -8
@@ -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"
@@ -94,7 +94,7 @@ static int me4600_dio_io_reset_subdevice(struct me_subdevice *subdevice,return ME_ERRNO_SUCCESS ; } -static int me4600_dio_io_single_config(me_subdevice_t * subdevice, +static int me4600_dio_io_single_config(me_subdevice_t *subdevice, struct file *filep, int channel, int single_config,
@@ -268,7 +268,7 @@ static int me4600_dio_io_single_config(me_subdevice_t * subdevice,return err; } -static int me4600_dio_io_single_read (me_subdevice_t * subdevice, +static int me4600_dio_io_single_read (me_subdevice_t *subdevice,struct file *filep,int channel,int *value,int time_out,int flags)
@@ -342,7 +342,7 @@ static int me4600_dio_io_single_read(me_subdevice_t * subdevice,return err; } -static int me4600_dio_io_single_write (me_subdevice_t * subdevice, +static int me4600_dio_io_single_write (me_subdevice_t *subdevice,struct file *filep,int channel,int value,int time_out,int flags)
@@ -425,7 +425,7 @@ static int me4600_dio_io_single_write(me_subdevice_t * subdevice,return err; } -static int me4600_dio_query_number_channels (me_subdevice_t * subdevice, +static int me4600_dio_query_number_channels (me_subdevice_t *subdevice,int *number) {PDEBUG ("executed.\n" );
@@ -433,7 +433,7 @@ static int me4600_dio_query_number_channels(me_subdevice_t * subdevice,return ME_ERRNO_SUCCESS ; } -static int me4600_dio_query_subdevice_type (me_subdevice_t * subdevice, +static int me4600_dio_query_subdevice_type (me_subdevice_t *subdevice,int *type,int *subtype) {PDEBUG ("executed.\n" );
@@ -442,7 +442,7 @@ static int me4600_dio_query_subdevice_type(me_subdevice_t * subdevice,return ME_ERRNO_SUCCESS ; } -static int me4600_dio_query_subdevice_caps (me_subdevice_t * subdevice, +static int me4600_dio_query_subdevice_caps (me_subdevice_t *subdevice,int *caps) {PDEBUG ("executed.\n" );
@@ -452,7 +452,7 @@ static int me4600_dio_query_subdevice_caps(me_subdevice_t * subdevice,me4600_dio_subdevice_t *me4600_dio_constructor (uint32_t reg_base,unsigned int dio_idx, -spinlock_t * ctrl_reg_lock) +spinlock_t *ctrl_reg_lock) {me4600_dio_subdevice_t *subdevice;int err;
drivers/staging/meilhaus/me4600_do.c +8 -8
@@ -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"
@@ -93,7 +93,7 @@ static int me4600_do_io_reset_subdevice(struct me_subdevice *subdevice,return ME_ERRNO_SUCCESS ; } -static int me4600_do_io_single_config(me_subdevice_t * subdevice, +static int me4600_do_io_single_config(me_subdevice_t *subdevice, struct file *filep, int channel, int single_config,
@@ -224,7 +224,7 @@ static int me4600_do_io_single_config(me_subdevice_t * subdevice,return err; } -static int me4600_do_io_single_read (me_subdevice_t * subdevice, +static int me4600_do_io_single_read (me_subdevice_t *subdevice,struct file *filep,int channel,int *value,int time_out,int flags)
@@ -284,7 +284,7 @@ static int me4600_do_io_single_read(me_subdevice_t * subdevice,return err; } -static int me4600_do_io_single_write (me_subdevice_t * subdevice, +static int me4600_do_io_single_write (me_subdevice_t *subdevice,struct file *filep,int channel,int value,int time_out,int flags)
@@ -352,7 +352,7 @@ static int me4600_do_io_single_write(me_subdevice_t * subdevice,return err; } -static int me4600_do_query_number_channels (me_subdevice_t * subdevice, +static int me4600_do_query_number_channels (me_subdevice_t *subdevice,int *number) {PDEBUG ("executed.\n" );
@@ -360,7 +360,7 @@ static int me4600_do_query_number_channels(me_subdevice_t * subdevice,return ME_ERRNO_SUCCESS ; } -static int me4600_do_query_subdevice_type (me_subdevice_t * subdevice, +static int me4600_do_query_subdevice_type (me_subdevice_t *subdevice,int *type,int *subtype) {PDEBUG ("executed.\n" );
@@ -369,7 +369,7 @@ static int me4600_do_query_subdevice_type(me_subdevice_t * subdevice,return ME_ERRNO_SUCCESS ; } -static int me4600_do_query_subdevice_caps (me_subdevice_t * subdevice,int *caps) +static int me4600_do_query_subdevice_caps (me_subdevice_t *subdevice,int *caps) {PDEBUG ("executed.\n" ); *caps =0 ;
@@ -377,7 +377,7 @@ static int me4600_do_query_subdevice_caps(me_subdevice_t * subdevice, int *caps) }me4600_do_subdevice_t *me4600_do_constructor (uint32_t reg_base, -spinlock_t * ctrl_reg_lock) +spinlock_t *ctrl_reg_lock) {me4600_do_subdevice_t *subdevice;int err;
drivers/staging/meilhaus/me4600_ext_irq.c +8 -8
@@ -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>
@@ -60,7 +60,7 @@* Functions */ -static int me4600_ext_irq_io_irq_start(me_subdevice_t * subdevice, +static int me4600_ext_irq_io_irq_start(me_subdevice_t *subdevice, struct file *filep, int channel, int irq_source,
@@ -135,7 +135,7 @@ static int me4600_ext_irq_io_irq_start(me_subdevice_t * subdevice,return err; } -static int me4600_ext_irq_io_irq_wait(me_subdevice_t * subdevice, +static int me4600_ext_irq_io_irq_wait(me_subdevice_t *subdevice, struct file *filep, int channel, int *irq_count,
@@ -214,7 +214,7 @@ static int me4600_ext_irq_io_irq_wait(me_subdevice_t * subdevice,return err; } -static int me4600_ext_irq_io_irq_stop (me_subdevice_t * subdevice, +static int me4600_ext_irq_io_irq_stop (me_subdevice_t *subdevice,struct file *filep,int channel,int flags) {
@@ -256,7 +256,7 @@ static int me4600_ext_irq_io_irq_stop(me_subdevice_t * subdevice,return err; } -static int me4600_ext_irq_io_reset_subdevice (me_subdevice_t * subdevice, +static int me4600_ext_irq_io_reset_subdevice (me_subdevice_t *subdevice,struct file *filep,int flags) {me4600_ext_irq_subdevice_t *instance;
@@ -308,7 +308,7 @@ static void me4600_ext_irq_destructor(struct me_subdevice *subdevice)kfree (instance); } -static int me4600_ext_irq_query_number_channels (me_subdevice_t * subdevice, +static int me4600_ext_irq_query_number_channels (me_subdevice_t *subdevice,int *number) {PDEBUG ("executed.\n" );
@@ -316,7 +316,7 @@ static int me4600_ext_irq_query_number_channels(me_subdevice_t * subdevice,return ME_ERRNO_SUCCESS ; } -static int me4600_ext_irq_query_subdevice_type (me_subdevice_t * subdevice, +static int me4600_ext_irq_query_subdevice_type (me_subdevice_t *subdevice,int *type,int *subtype) {PDEBUG ("executed.\n" );
@@ -325,7 +325,7 @@ static int me4600_ext_irq_query_subdevice_type(me_subdevice_t * subdevice,return ME_ERRNO_SUCCESS ; } -static int me4600_ext_irq_query_subdevice_caps (me_subdevice_t * subdevice, +static int me4600_ext_irq_query_subdevice_caps (me_subdevice_t *subdevice,int *caps) {PDEBUG ("executed.\n" );
drivers/staging/meilhaus/me6000_ao.c +53 -53
341 lines not on this page · raw message
drivers/staging/meilhaus/me6000_device.c +1 -3
@@ -178,6 +178,7 @@ me_device_t *me6000_pci_constructor(struct pci_dev *pci_device)return (me_device_t *) me6000_device; } +EXPORT_SYMBOL (me6000_pci_constructor);// Init and exit of module.
@@ -206,6 +207,3 @@ MODULE_AUTHORMODULE_DESCRIPTION ("Device Driver Module for ME-6000 Device" );MODULE_SUPPORTED_DEVICE ("Meilhaus ME-6000 Devices" );MODULE_LICENSE ("GPL" ); - -// Export the constructor. -EXPORT_SYMBOL (me6000_pci_constructor);
drivers/staging/meilhaus/me6000_dio.c +8 -8
@@ -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 me6000_dio_io_reset_subdevice(struct me_subdevice *subdevice,return ME_ERRNO_SUCCESS ; } -static int me6000_dio_io_single_config(me_subdevice_t * subdevice, +static int me6000_dio_io_single_config(me_subdevice_t *subdevice, struct file *filep, int channel, int single_config,
@@ -161,7 +161,7 @@ static int me6000_dio_io_single_config(me_subdevice_t * subdevice,return err; } -static int me6000_dio_io_single_read (me_subdevice_t * subdevice, +static int me6000_dio_io_single_read (me_subdevice_t *subdevice,struct file *filep,int channel,int *value,int time_out,int flags)
@@ -233,7 +233,7 @@ static int me6000_dio_io_single_read(me_subdevice_t * subdevice,return err; } -static int me6000_dio_io_single_write (me_subdevice_t * subdevice, +static int me6000_dio_io_single_write (me_subdevice_t *subdevice,struct file *filep,int channel,int value,int time_out,int flags)
@@ -314,7 +314,7 @@ static int me6000_dio_io_single_write(me_subdevice_t * subdevice,return err; } -static int me6000_dio_query_number_channels (me_subdevice_t * subdevice, +static int me6000_dio_query_number_channels (me_subdevice_t *subdevice,int *number) {PDEBUG ("executed.\n" );
@@ -322,7 +322,7 @@ static int me6000_dio_query_number_channels(me_subdevice_t * subdevice,return ME_ERRNO_SUCCESS ; } -static int me6000_dio_query_subdevice_type (me_subdevice_t * subdevice, +static int me6000_dio_query_subdevice_type (me_subdevice_t *subdevice,int *type,int *subtype) {PDEBUG ("executed.\n" );
@@ -331,7 +331,7 @@ static int me6000_dio_query_subdevice_type(me_subdevice_t * subdevice,return ME_ERRNO_SUCCESS ; } -static int me6000_dio_query_subdevice_caps (me_subdevice_t * subdevice, +static int me6000_dio_query_subdevice_caps (me_subdevice_t *subdevice,int *caps) {PDEBUG ("executed.\n" );
@@ -341,7 +341,7 @@ static int me6000_dio_query_subdevice_caps(me_subdevice_t * subdevice,me6000_dio_subdevice_t *me6000_dio_constructor (uint32_t reg_base,unsigned int dio_idx, -spinlock_t * ctrl_reg_lock) +spinlock_t *ctrl_reg_lock) {me6000_dio_subdevice_t *subdevice;int err;
drivers/staging/meilhaus/me8100_device.c +1 -3
@@ -159,6 +159,7 @@ me_device_t *me8100_pci_constructor(struct pci_dev *pci_device)return (me_device_t *) me8100_device; } +EXPORT_SYMBOL (me8100_pci_constructor);// Init and exit of module.
@@ -182,6 +183,3 @@ MODULE_AUTHOR("Guenter Gebhardt <[email protected]>");MODULE_DESCRIPTION ("Device Driver Module for Template Device" );MODULE_SUPPORTED_DEVICE ("Meilhaus Template Devices" );MODULE_LICENSE ("GPL" ); - -// Export the constructor. -EXPORT_SYMBOL (me8100_pci_constructor);
drivers/staging/meilhaus/me8100_di.c +10 -10
@@ -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 <linux/interrupt.h> #include <linux/version.h>
@@ -114,7 +114,7 @@ static int me8100_di_io_reset_subdevice(struct me_subdevice *subdevice,return ME_ERRNO_SUCCESS ; } -static int me8100_di_io_irq_start(me_subdevice_t * subdevice, +static int me8100_di_io_irq_start(me_subdevice_t *subdevice, struct file *filep, int channel, int irq_source,
@@ -208,7 +208,7 @@ static int me8100_di_io_irq_start(me_subdevice_t * subdevice,return err; } -static int me8100_di_io_irq_wait(me_subdevice_t * subdevice, +static int me8100_di_io_irq_wait(me_subdevice_t *subdevice, struct file *filep, int channel, int *irq_count,
@@ -315,7 +315,7 @@ static int me8100_di_io_irq_wait(me_subdevice_t * subdevice,return err; } -static int me8100_di_io_irq_stop (me_subdevice_t * subdevice, +static int me8100_di_io_irq_stop (me_subdevice_t *subdevice,struct file *filep,int channel,int flags) {me8100_di_subdevice_t *instance;
@@ -358,7 +358,7 @@ static int me8100_di_io_irq_stop(me_subdevice_t * subdevice,return ME_ERRNO_SUCCESS ; } -static int me8100_di_io_single_config(me_subdevice_t * subdevice, +static int me8100_di_io_single_config(me_subdevice_t *subdevice, struct file *filep, int channel, int single_config,
@@ -405,7 +405,7 @@ static int me8100_di_io_single_config(me_subdevice_t * subdevice,return err; } -static int me8100_di_io_single_read (me_subdevice_t * subdevice, +static int me8100_di_io_single_read (me_subdevice_t *subdevice,struct file *filep,int channel,int *value,int time_out,int flags)
@@ -466,7 +466,7 @@ static int me8100_di_io_single_read(me_subdevice_t * subdevice,return err; } -static int me8100_di_query_number_channels (me_subdevice_t * subdevice, +static int me8100_di_query_number_channels (me_subdevice_t *subdevice,int *number) {PDEBUG ("executed.\n" );
@@ -474,7 +474,7 @@ static int me8100_di_query_number_channels(me_subdevice_t * subdevice,return ME_ERRNO_SUCCESS ; } -static int me8100_di_query_subdevice_type (me_subdevice_t * subdevice, +static int me8100_di_query_subdevice_type (me_subdevice_t *subdevice,int *type,int *subtype) {PDEBUG ("executed.\n" );
@@ -483,7 +483,7 @@ static int me8100_di_query_subdevice_type(me_subdevice_t * subdevice,return ME_ERRNO_SUCCESS ; } -static int me8100_di_query_subdevice_caps (me_subdevice_t * subdevice,int *caps) +static int me8100_di_query_subdevice_caps (me_subdevice_t *subdevice,int *caps) {PDEBUG ("executed.\n" ); *caps =ME_CAPS_DIO_BIT_PATTERN_IRQ |ME_CAPS_DIO_BIT_MASK_IRQ_EDGE_ANY ;
@@ -594,7 +594,7 @@ me8100_di_subdevice_t *me8100_di_constructor(uint32_t me8100_reg_base,uint32_t plx_reg_base, unsigned int di_idx, int irq, - spinlock_t * ctrl_reg_lock) + spinlock_t *ctrl_reg_lock) { me8100_di_subdevice_t *subdevice;int err;
drivers/staging/meilhaus/me8100_do.c +8 -8
@@ -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;
drivers/staging/meilhaus/me8200_device.c +1 -3
@@ -166,6 +166,7 @@ me_device_t *me8200_pci_constructor(struct pci_dev *pci_device)return (me_device_t *) me8200_device; } +EXPORT_SYMBOL (me8200_pci_constructor);// Init and exit of module.
@@ -189,6 +190,3 @@ MODULE_AUTHOR("Guenter Gebhardt <[email protected]>");MODULE_DESCRIPTION ("Device Driver Module for Template Device" );MODULE_SUPPORTED_DEVICE ("Meilhaus Template Devices" );MODULE_LICENSE ("GPL" ); - -// Export the constructor. -EXPORT_SYMBOL (me8200_pci_constructor);
drivers/staging/meilhaus/me8200_di.c +21 -21
136 lines not on this page · raw message
drivers/staging/meilhaus/me8200_dio.c +8 -8
@@ -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"
@@ -90,7 +90,7 @@ static int me8200_dio_io_reset_subdevice(struct me_subdevice *subdevice,return ME_ERRNO_SUCCESS ; } -static int me8200_dio_io_single_config(me_subdevice_t * subdevice, +static int me8200_dio_io_single_config(me_subdevice_t *subdevice, struct file *filep, int channel, int single_config,
@@ -164,7 +164,7 @@ static int me8200_dio_io_single_config(me_subdevice_t * subdevice,return err; } -static int me8200_dio_io_single_read (me_subdevice_t * subdevice, +static int me8200_dio_io_single_read (me_subdevice_t *subdevice,struct file *filep,int channel,int *value,int time_out,int flags)
@@ -241,7 +241,7 @@ static int me8200_dio_io_single_read(me_subdevice_t * subdevice,return err; } -static int me8200_dio_io_single_write (me_subdevice_t * subdevice, +static int me8200_dio_io_single_write (me_subdevice_t *subdevice,struct file *filep,int channel,int value,int time_out,int flags)
@@ -332,7 +332,7 @@ static int me8200_dio_io_single_write(me_subdevice_t * subdevice,return err; } -static int me8200_dio_query_number_channels (me_subdevice_t * subdevice, +static int me8200_dio_query_number_channels (me_subdevice_t *subdevice,int *number) {PDEBUG ("executed.\n" );
@@ -340,7 +340,7 @@ static int me8200_dio_query_number_channels(me_subdevice_t * subdevice,return ME_ERRNO_SUCCESS ; } -static int me8200_dio_query_subdevice_type (me_subdevice_t * subdevice, +static int me8200_dio_query_subdevice_type (me_subdevice_t *subdevice,int *type,int *subtype) {PDEBUG ("executed.\n" );
@@ -349,7 +349,7 @@ static int me8200_dio_query_subdevice_type(me_subdevice_t * subdevice,return ME_ERRNO_SUCCESS ; } -static int me8200_dio_query_subdevice_caps (me_subdevice_t * subdevice, +static int me8200_dio_query_subdevice_caps (me_subdevice_t *subdevice,int *caps) {PDEBUG ("executed.\n" );
@@ -359,7 +359,7 @@ static int me8200_dio_query_subdevice_caps(me_subdevice_t * subdevice,me8200_dio_subdevice_t *me8200_dio_constructor (uint32_t reg_base,unsigned int dio_idx, -spinlock_t * ctrl_reg_lock) +spinlock_t *ctrl_reg_lock) {me8200_dio_subdevice_t *subdevice;int err;
drivers/staging/meilhaus/me8200_do.c +11 -11
@@ -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;
drivers/staging/meilhaus/me8254.c +7 -7
@@ -35,7 +35,7 @@#include <linux/slab.h> #include <linux/spinlock.h> -#include <asm/io.h> +#include <linux/io.h> #include <linux/types.h> #include "medefines.h"
@@ -183,7 +183,7 @@ static int me8254_io_reset_subdevice(struct me_subdevice *subdevice,return err; } -static int me1400_ab_ref_config (me8254_subdevice_t * instance,int ref) +static int me1400_ab_ref_config (me8254_subdevice_t *instance,int ref) {uint8_t clk_src;
@@ -291,7 +291,7 @@ static int me1400_ab_ref_config(me8254_subdevice_t * instance, int ref)return ME_ERRNO_SUCCESS ; } -static int me1400_cd_ref_config (me8254_subdevice_t * instance,int ref) +static int me1400_cd_ref_config (me8254_subdevice_t *instance,int ref) {uint8_t clk_src;
@@ -436,7 +436,7 @@ static int me1400_cd_ref_config(me8254_subdevice_t * instance, int ref)return ME_ERRNO_SUCCESS ; } -static int me4600_ref_config (me8254_subdevice_t * instance,int ref) +static int me4600_ref_config (me8254_subdevice_t *instance,int ref) {switch (ref) {
@@ -453,7 +453,7 @@ static int me4600_ref_config(me8254_subdevice_t * instance, int ref)return ME_ERRNO_SUCCESS ; } -static int me8100_ref_config (me8254_subdevice_t * instance,int ref) +static int me8100_ref_config (me8254_subdevice_t *instance,int ref) {switch (ref) {
@@ -962,8 +962,8 @@ me8254_subdevice_t *me8254_constructor(uint32_t device_id,uint32_t reg_base, unsigned int me8254_idx, unsigned int ctr_idx, - spinlock_t * ctrl_reg_lock, - spinlock_t * clk_src_reg_lock) + spinlock_t *ctrl_reg_lock, + spinlock_t *clk_src_reg_lock) { me8254_subdevice_t *subdevice;int err;
drivers/staging/meilhaus/me8255.c +2 -2
@@ -35,7 +35,7 @@#include <linux/slab.h> #include <linux/spinlock.h> -#include <asm/io.h> +#include <linux/io.h> #include <linux/types.h> #include "medefines.h"
@@ -318,7 +318,7 @@ me8255_subdevice_t *me8255_constructor(uint32_t device_id,unsigned int me8255_idx, unsigned int dio_idx, int *ctrl_reg_mirror, - spinlock_t * ctrl_reg_lock) + spinlock_t *ctrl_reg_lock) { me8255_subdevice_t *subdevice;int err;
drivers/staging/meilhaus/mecirc_buf.h +8 -8
@@ -40,19 +40,19 @@ typedef struct me_circ_buf {int volatile tail; } me_circ_buf_t; -static int inline me_circ_buf_values (me_circ_buf_t * buf) +static inline int me_circ_buf_values (me_circ_buf_t * buf) {// return ((buf->head - buf->tail) & (buf->count - 1)); return ((buf->head - buf->tail) & (buf->mask)); } -static int inline me_circ_buf_space (me_circ_buf_t * buf) +static inline int me_circ_buf_space (me_circ_buf_t * buf) {// return ((buf->tail - (buf->head + 1)) & (buf->count - 1)); return ((buf->tail - (buf->head +1 )) & (buf->mask)); } -static int inline me_circ_buf_values_to_end (me_circ_buf_t * buf) +static inline int me_circ_buf_values_to_end (me_circ_buf_t * buf) {int end;int n;
@@ -63,7 +63,7 @@ static int inline me_circ_buf_values_to_end(me_circ_buf_t * buf)return (n < end) ? n : end; } -static int inline me_circ_buf_space_to_end (me_circ_buf_t * buf) +static inline int me_circ_buf_space_to_end (me_circ_buf_t * buf) {int end;int n;
@@ -99,19 +99,19 @@ typedef struct me_circ_buf_16b {# endif //_CBUFF_32b_t /** How many values is in buffer */ -static int inline me_circ_buf_values (me_circ_buf_t * buf) +static inline int me_circ_buf_values (me_circ_buf_t * buf) {return ((buf->head - buf->tail) & (buf->mask)); }/** How many space left */ -static int inline me_circ_buf_space (me_circ_buf_t * buf) +static inline int me_circ_buf_space (me_circ_buf_t * buf) {return ((buf->tail - (buf->head +1 )) & (buf->mask)); }/** How many values can be read from buffor in one chunck. */ -static int inline me_circ_buf_values_to_end (me_circ_buf_t * buf) +static inline int me_circ_buf_values_to_end (me_circ_buf_t * buf) {return (buf->tail <= buf->head) ? (buf->head - buf->tail) : (buf->mask - buf->tail +
@@ -119,7 +119,7 @@ static int inline me_circ_buf_values_to_end(me_circ_buf_t * buf) }/** How many values can be write to buffer in one chunck. */ -static int inline me_circ_buf_space_to_end (me_circ_buf_t * buf) +static inline int me_circ_buf_space_to_end (me_circ_buf_t * buf) {return (buf->tail <= buf->head) ? (buf->mask - buf->head + 1) : (buf->tail -
drivers/staging/meilhaus/medevice.c +7 -7
@@ -390,9 +390,9 @@ static int me_device_io_single_write(struct me_device *device,static int me_device_io_stream_config (struct me_device *device,struct file *filep,int subdevice, -meIOStreamConfig_t * config_list, +meIOStreamConfig_t *config_list,int count, -meIOStreamTrigger_t * trigger, +meIOStreamTrigger_t *trigger,int fifo_irq_threshold,int flags) {int err =ME_ERRNO_SUCCESS ;
@@ -1040,7 +1040,7 @@ static int me_device_query_timer(struct me_device *device,int subdevice, int timer, int *base_frequency, - uint64_t * min_ticks, uint64_t * max_ticks) + uint64_t *min_ticks, uint64_t *max_ticks) { int err = ME_ERRNO_SUCCESS;me_subdevice_t *s;
@@ -1082,14 +1082,14 @@ static int me_device_query_version_device_driver(struct me_device *device, }static int me_device_config_load (struct me_device *device,struct file *filep, -me_cfg_device_entry_t * config) +me_cfg_device_entry_t *config) {PDEBUG ("executed.\n" );return ME_ERRNO_SUCCESS ;//If no need for config return success. // return ME_ERRNO_NOT_SUPPORTED; } -static void me_device_destructor (me_device_t * me_device) +static void me_device_destructor (me_device_t *me_device) {PDEBUG ("executed.\n" );me_device_deinit (me_device);
@@ -1581,7 +1581,7 @@ static int get_device_descriptions(uint16_t device_id,return 0 ; } -int me_device_pci_init (me_device_t * me_device,struct pci_dev *pci_device) +int me_device_pci_init (me_device_t *me_device,struct pci_dev *pci_device) {int err;int i;
@@ -1720,7 +1720,7 @@ int me_device_pci_init(me_device_t * me_device, struct pci_dev *pci_device)return 1 ; } -void me_device_deinit (me_device_t * me_device) +void me_device_deinit (me_device_t *me_device) {PDEBUG ("executed.\n" );
drivers/staging/meilhaus/medlist.c +3 -3
@@ -69,7 +69,7 @@ me_device_t *me_dlist_get_device(struct me_dlist * dlist, unsigned int index)return device; } -void me_dlist_add_device_tail (struct me_dlist *dlist,me_device_t * device) +void me_dlist_add_device_tail (struct me_dlist *dlist,me_device_t *device) {PDEBUG_LOCKS ("called.\n" );
@@ -99,7 +99,7 @@ me_device_t *me_dlist_del_device_tail(struct me_dlist *dlist)return device; } -int me_dlist_init (me_dlist_t * dlist) +int me_dlist_init (me_dlist_t *dlist) {PDEBUG_LOCKS ("called.\n" );
@@ -108,7 +108,7 @@ int me_dlist_init(me_dlist_t * dlist)return 0 ; } -void me_dlist_deinit (me_dlist_t * dlist) +void me_dlist_deinit (me_dlist_t *dlist) {struct list_head *s;
drivers/staging/meilhaus/medlock.c +2 -2
@@ -65,7 +65,7 @@ int me_dlock_exit(struct me_dlock *dlock, struct file *filep) }int me_dlock_lock (struct me_dlock *dlock, -struct file *filep,int lock,int flags,me_slist_t * slist) +struct file *filep,int lock,int flags,me_slist_t *slist) {int err =ME_ERRNO_SUCCESS ;int i;
@@ -183,7 +183,7 @@ void me_dlock_deinit(struct me_dlock *dlock)PDEBUG_LOCKS ("executed.\n" ); } -int me_dlock_init (me_dlock_t * dlock) +int me_dlock_init (me_dlock_t *dlock) {PDEBUG_LOCKS ("executed.\n" );
drivers/staging/meilhaus/medummy.c +41 -43
112 lines not on this page · raw message
drivers/staging/meilhaus/metempl_device.c +1 -3
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.