diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2009-03-16 22:03:29 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:53:53 -0700 |
commit | e473e9120b0a2d7252aca1ed9db5adadee36c0fa (patch) | |
tree | acba1a6b208e86faa4907c6693b41daafae5b25e /drivers/staging/comedi/drivers/me4000.c | |
parent | b6c777571b8d387d3add91170826f32a379e4313 (diff) |
Staging: comedi: Change "foo * bar" to "foo *bar"
Removes checkpatch.pl errors
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/drivers/me4000.c')
-rw-r--r-- | drivers/staging/comedi/drivers/me4000.c | 182 |
1 files changed, 91 insertions, 91 deletions
diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c index 2608c8713c90..3aafedecf7ed 100644 --- a/drivers/staging/comedi/drivers/me4000.c +++ b/drivers/staging/comedi/drivers/me4000.c @@ -118,8 +118,8 @@ static const me4000_board_t me4000_boards[] = { /*----------------------------------------------------------------------------- Comedi function prototypes ---------------------------------------------------------------------------*/ -static int me4000_attach(comedi_device * dev, comedi_devconfig * it); -static int me4000_detach(comedi_device * dev); +static int me4000_attach(comedi_device *dev, comedi_devconfig *it); +static int me4000_detach(comedi_device *dev); static comedi_driver driver_me4000 = { driver_name:"me4000", module:THIS_MODULE, @@ -130,91 +130,91 @@ static comedi_driver driver_me4000 = { /*----------------------------------------------------------------------------- Meilhaus function prototypes ---------------------------------------------------------------------------*/ -static int me4000_probe(comedi_device * dev, comedi_devconfig * it); -static int get_registers(comedi_device * dev, struct pci_dev *pci_dev_p); -static int init_board_info(comedi_device * dev, struct pci_dev *pci_dev_p); -static int init_ao_context(comedi_device * dev); -static int init_ai_context(comedi_device * dev); -static int init_dio_context(comedi_device * dev); -static int init_cnt_context(comedi_device * dev); -static int xilinx_download(comedi_device * dev); -static int reset_board(comedi_device * dev); +static int me4000_probe(comedi_device *dev, comedi_devconfig *it); +static int get_registers(comedi_device *dev, struct pci_dev *pci_dev_p); +static int init_board_info(comedi_device *dev, struct pci_dev *pci_dev_p); +static int init_ao_context(comedi_device *dev); +static int init_ai_context(comedi_device *dev); +static int init_dio_context(comedi_device *dev); +static int init_cnt_context(comedi_device *dev); +static int xilinx_download(comedi_device *dev); +static int reset_board(comedi_device *dev); -static int me4000_dio_insn_bits(comedi_device * dev, - comedi_subdevice * s, comedi_insn * insn, lsampl_t * data); +static int me4000_dio_insn_bits(comedi_device *dev, + comedi_subdevice *s, comedi_insn *insn, lsampl_t *data); -static int me4000_dio_insn_config(comedi_device * dev, - comedi_subdevice * s, comedi_insn * insn, lsampl_t * data); +static int me4000_dio_insn_config(comedi_device *dev, + comedi_subdevice *s, comedi_insn *insn, lsampl_t *data); -static int cnt_reset(comedi_device * dev, unsigned int channel); +static int cnt_reset(comedi_device *dev, unsigned int channel); -static int cnt_config(comedi_device * dev, +static int cnt_config(comedi_device *dev, unsigned int channel, unsigned int mode); -static int me4000_cnt_insn_config(comedi_device * dev, - comedi_subdevice * s, comedi_insn * insn, lsampl_t * data); +static int me4000_cnt_insn_config(comedi_device *dev, + comedi_subdevice *s, comedi_insn *insn, lsampl_t *data); -static int me4000_cnt_insn_write(comedi_device * dev, - comedi_subdevice * s, comedi_insn * insn, lsampl_t * data); +static int me4000_cnt_insn_write(comedi_device *dev, + comedi_subdevice *s, comedi_insn *insn, lsampl_t *data); -static int me4000_cnt_insn_read(comedi_device * dev, - comedi_subdevice * s, comedi_insn * insn, lsampl_t * data); +static int me4000_cnt_insn_read(comedi_device *dev, + comedi_subdevice *s, comedi_insn *insn, lsampl_t *data); -static int me4000_ai_insn_read(comedi_device * dev, - comedi_subdevice * subdevice, comedi_insn * insn, lsampl_t * data); +static int me4000_ai_insn_read(comedi_device *dev, + comedi_subdevice *subdevice, comedi_insn *insn, lsampl_t *data); -static int me4000_ai_cancel(comedi_device * dev, comedi_subdevice * s); +static int me4000_ai_cancel(comedi_device *dev, comedi_subdevice *s); -static int ai_check_chanlist(comedi_device * dev, - comedi_subdevice * s, comedi_cmd * cmd); +static int ai_check_chanlist(comedi_device *dev, + comedi_subdevice *s, comedi_cmd *cmd); -static int ai_round_cmd_args(comedi_device * dev, - comedi_subdevice * s, - comedi_cmd * cmd, +static int ai_round_cmd_args(comedi_device *dev, + comedi_subdevice *s, + comedi_cmd *cmd, unsigned int *init_ticks, unsigned int *scan_ticks, unsigned int *chan_ticks); -static int ai_prepare(comedi_device * dev, - comedi_subdevice * s, - comedi_cmd * cmd, +static int ai_prepare(comedi_device *dev, + comedi_subdevice *s, + comedi_cmd *cmd, unsigned int init_ticks, unsigned int scan_ticks, unsigned int chan_ticks); -static int ai_write_chanlist(comedi_device * dev, - comedi_subdevice * s, comedi_cmd * cmd); +static int ai_write_chanlist(comedi_device *dev, + comedi_subdevice *s, comedi_cmd *cmd); static irqreturn_t me4000_ai_isr(int irq, void *dev_id PT_REGS_ARG); -static int me4000_ai_do_cmd_test(comedi_device * dev, - comedi_subdevice * s, comedi_cmd * cmd); +static int me4000_ai_do_cmd_test(comedi_device *dev, + comedi_subdevice *s, comedi_cmd *cmd); -static int me4000_ai_do_cmd(comedi_device * dev, comedi_subdevice * s); +static int me4000_ai_do_cmd(comedi_device *dev, comedi_subdevice *s); -static int me4000_ao_insn_write(comedi_device * dev, - comedi_subdevice * s, comedi_insn * insn, lsampl_t * data); +static int me4000_ao_insn_write(comedi_device *dev, + comedi_subdevice *s, comedi_insn *insn, lsampl_t *data); -static int me4000_ao_insn_read(comedi_device * dev, - comedi_subdevice * s, comedi_insn * insn, lsampl_t * data); +static int me4000_ao_insn_read(comedi_device *dev, + comedi_subdevice *s, comedi_insn *insn, lsampl_t *data); /*----------------------------------------------------------------------------- Meilhaus inline functions ---------------------------------------------------------------------------*/ -static inline void me4000_outb(comedi_device * dev, unsigned char value, +static inline void me4000_outb(comedi_device *dev, unsigned char value, unsigned long port) { PORT_PDEBUG("--> 0x%02X port 0x%04lX\n", value, port); outb(value, port); } -static inline void me4000_outl(comedi_device * dev, unsigned long value, +static inline void me4000_outl(comedi_device *dev, unsigned long value, unsigned long port) { PORT_PDEBUG("--> 0x%08lX port 0x%04lX\n", value, port); outl(value, port); } -static inline unsigned long me4000_inl(comedi_device * dev, unsigned long port) +static inline unsigned long me4000_inl(comedi_device *dev, unsigned long port) { unsigned long value; value = inl(port); @@ -222,7 +222,7 @@ static inline unsigned long me4000_inl(comedi_device * dev, unsigned long port) return value; } -static inline unsigned char me4000_inb(comedi_device * dev, unsigned long port) +static inline unsigned char me4000_inb(comedi_device *dev, unsigned long port) { unsigned char value; value = inb(port); @@ -247,7 +247,7 @@ static const comedi_lrange me4000_ao_range = { } }; -static int me4000_attach(comedi_device * dev, comedi_devconfig * it) +static int me4000_attach(comedi_device *dev, comedi_devconfig *it) { comedi_subdevice *s; int result; @@ -369,7 +369,7 @@ static int me4000_attach(comedi_device * dev, comedi_devconfig * it) return 0; } -static int me4000_probe(comedi_device * dev, comedi_devconfig * it) +static int me4000_probe(comedi_device *dev, comedi_devconfig *it) { struct pci_dev *pci_device; int result, i; @@ -512,7 +512,7 @@ static int me4000_probe(comedi_device * dev, comedi_devconfig * it) return 0; } -static int get_registers(comedi_device * dev, struct pci_dev *pci_dev_p) +static int get_registers(comedi_device *dev, struct pci_dev *pci_dev_p) { CALL_PDEBUG("In get_registers()\n"); @@ -564,7 +564,7 @@ static int get_registers(comedi_device * dev, struct pci_dev *pci_dev_p) return 0; } -static int init_board_info(comedi_device * dev, struct pci_dev *pci_dev_p) +static int init_board_info(comedi_device *dev, struct pci_dev *pci_dev_p) { int result; @@ -598,7 +598,7 @@ static int init_board_info(comedi_device * dev, struct pci_dev *pci_dev_p) return 0; } -static int init_ao_context(comedi_device * dev) +static int init_ao_context(comedi_device *dev) { int i; @@ -681,7 +681,7 @@ static int init_ao_context(comedi_device * dev) return 0; } -static int init_ai_context(comedi_device * dev) +static int init_ai_context(comedi_device *dev) { CALL_PDEBUG("In init_ai_context()\n"); @@ -715,7 +715,7 @@ static int init_ai_context(comedi_device * dev) return 0; } -static int init_dio_context(comedi_device * dev) +static int init_dio_context(comedi_device *dev) { CALL_PDEBUG("In init_dio_context()\n"); @@ -734,7 +734,7 @@ static int init_dio_context(comedi_device * dev) return 0; } -static int init_cnt_context(comedi_device * dev) +static int init_cnt_context(comedi_device *dev) { CALL_PDEBUG("In init_cnt_context()\n"); @@ -755,7 +755,7 @@ static int init_cnt_context(comedi_device * dev) extern unsigned char *xilinx_firm; #endif -static int xilinx_download(comedi_device * dev) +static int xilinx_download(comedi_device *dev) { u32 value = 0; wait_queue_head_t queue; @@ -837,7 +837,7 @@ static int xilinx_download(comedi_device * dev) return 0; } -static int reset_board(comedi_device * dev) +static int reset_board(comedi_device *dev) { unsigned long icr; @@ -895,7 +895,7 @@ static int reset_board(comedi_device * dev) return 0; } -static int me4000_detach(comedi_device * dev) +static int me4000_detach(comedi_device *dev) { CALL_PDEBUG("In me4000_detach()\n"); @@ -916,8 +916,8 @@ static int me4000_detach(comedi_device * dev) Analog input section ===========================================================================*/ -static int me4000_ai_insn_read(comedi_device * dev, - comedi_subdevice * subdevice, comedi_insn * insn, lsampl_t * data) +static int me4000_ai_insn_read(comedi_device *dev, + comedi_subdevice *subdevice, comedi_insn *insn, lsampl_t *data) { int chan = CR_CHAN(insn->chanspec); @@ -1040,7 +1040,7 @@ static int me4000_ai_insn_read(comedi_device * dev, return 1; } -static int me4000_ai_cancel(comedi_device * dev, comedi_subdevice * s) +static int me4000_ai_cancel(comedi_device *dev, comedi_subdevice *s) { unsigned long tmp; @@ -1057,8 +1057,8 @@ static int me4000_ai_cancel(comedi_device * dev, comedi_subdevice * s) return 0; } -static int ai_check_chanlist(comedi_device * dev, - comedi_subdevice * s, comedi_cmd * cmd) +static int ai_check_chanlist(comedi_device *dev, + comedi_subdevice *s, comedi_cmd *cmd) { int aref; int i; @@ -1138,9 +1138,9 @@ static int ai_check_chanlist(comedi_device * dev, return 0; } -static int ai_round_cmd_args(comedi_device * dev, - comedi_subdevice * s, - comedi_cmd * cmd, +static int ai_round_cmd_args(comedi_device *dev, + comedi_subdevice *s, + comedi_cmd *cmd, unsigned int *init_ticks, unsigned int *scan_ticks, unsigned int *chan_ticks) { @@ -1207,7 +1207,7 @@ static int ai_round_cmd_args(comedi_device * dev, return 0; } -static void ai_write_timer(comedi_device * dev, +static void ai_write_timer(comedi_device *dev, unsigned int init_ticks, unsigned int scan_ticks, unsigned int chan_ticks) { @@ -1228,9 +1228,9 @@ static void ai_write_timer(comedi_device * dev, me4000_outl(dev, chan_ticks - 1, info->ai_context.chan_timer_reg); } -static int ai_prepare(comedi_device * dev, - comedi_subdevice * s, - comedi_cmd * cmd, +static int ai_prepare(comedi_device *dev, + comedi_subdevice *s, + comedi_cmd *cmd, unsigned int init_ticks, unsigned int scan_ticks, unsigned int chan_ticks) { @@ -1297,8 +1297,8 @@ static int ai_prepare(comedi_device * dev, return 0; } -static int ai_write_chanlist(comedi_device * dev, - comedi_subdevice * s, comedi_cmd * cmd) +static int ai_write_chanlist(comedi_device *dev, + comedi_subdevice *s, comedi_cmd *cmd) { unsigned int entry; unsigned int chan; @@ -1337,7 +1337,7 @@ static int ai_write_chanlist(comedi_device * dev, return 0; } -static int me4000_ai_do_cmd(comedi_device * dev, comedi_subdevice * s) +static int me4000_ai_do_cmd(comedi_device *dev, comedi_subdevice *s) { int err; unsigned int init_ticks = 0; @@ -1381,8 +1381,8 @@ static int me4000_ai_do_cmd(comedi_device * dev, comedi_subdevice * s) * - invalid chanlist * So I tried to adopt this scheme. */ -static int me4000_ai_do_cmd_test(comedi_device * dev, - comedi_subdevice * s, comedi_cmd * cmd) +static int me4000_ai_do_cmd_test(comedi_device *dev, + comedi_subdevice *s, comedi_cmd *cmd) { unsigned int init_ticks; @@ -1911,8 +1911,8 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id PT_REGS_ARG) Analog output section ===========================================================================*/ -static int me4000_ao_insn_write(comedi_device * dev, - comedi_subdevice * s, comedi_insn * insn, lsampl_t * data) +static int me4000_ao_insn_write(comedi_device *dev, + comedi_subdevice *s, comedi_insn *insn, lsampl_t *data) { int chan = CR_CHAN(insn->chanspec); @@ -1969,8 +1969,8 @@ static int me4000_ao_insn_write(comedi_device * dev, return 1; } -static int me4000_ao_insn_read(comedi_device * dev, - comedi_subdevice * s, comedi_insn * insn, lsampl_t * data) +static int me4000_ao_insn_read(comedi_device *dev, + comedi_subdevice *s, comedi_insn *insn, lsampl_t *data) { int chan = CR_CHAN(insn->chanspec); @@ -1990,8 +1990,8 @@ static int me4000_ao_insn_read(comedi_device * dev, Digital I/O section ===========================================================================*/ -static int me4000_dio_insn_bits(comedi_device * dev, - comedi_subdevice * s, comedi_insn * insn, lsampl_t * data) +static int me4000_dio_insn_bits(comedi_device *dev, + comedi_subdevice *s, comedi_insn *insn, lsampl_t *data) { CALL_PDEBUG("In me4000_dio_insn_bits()\n"); @@ -2041,8 +2041,8 @@ static int me4000_dio_insn_bits(comedi_device * dev, return 2; } -static int me4000_dio_insn_config(comedi_device * dev, - comedi_subdevice * s, comedi_insn * insn, lsampl_t * data) +static int me4000_dio_insn_config(comedi_device *dev, + comedi_subdevice *s, comedi_insn *insn, lsampl_t *data) { unsigned long tmp; int chan = CR_CHAN(insn->chanspec); @@ -2135,7 +2135,7 @@ static int me4000_dio_insn_config(comedi_device * dev, Counter section ===========================================================================*/ -static int cnt_reset(comedi_device * dev, unsigned int channel) +static int cnt_reset(comedi_device *dev, unsigned int channel) { CALL_PDEBUG("In cnt_reset()\n"); @@ -2166,7 +2166,7 @@ static int cnt_reset(comedi_device * dev, unsigned int channel) return 0; } -static int cnt_config(comedi_device * dev, unsigned int channel, +static int cnt_config(comedi_device *dev, unsigned int channel, unsigned int mode) { int tmp = 0; @@ -2223,8 +2223,8 @@ static int cnt_config(comedi_device * dev, unsigned int channel, return 0; } -static int me4000_cnt_insn_config(comedi_device * dev, - comedi_subdevice * s, comedi_insn * insn, lsampl_t * data) +static int me4000_cnt_insn_config(comedi_device *dev, + comedi_subdevice *s, comedi_insn *insn, lsampl_t *data) { int err; @@ -2266,8 +2266,8 @@ static int me4000_cnt_insn_config(comedi_device * dev, return 2; } -static int me4000_cnt_insn_read(comedi_device * dev, - comedi_subdevice * s, comedi_insn * insn, lsampl_t * data) +static int me4000_cnt_insn_read(comedi_device *dev, + comedi_subdevice *s, comedi_insn *insn, lsampl_t *data) { unsigned short tmp; @@ -2313,8 +2313,8 @@ static int me4000_cnt_insn_read(comedi_device * dev, return 1; } -static int me4000_cnt_insn_write(comedi_device * dev, - comedi_subdevice * s, comedi_insn * insn, lsampl_t * data) +static int me4000_cnt_insn_write(comedi_device *dev, + comedi_subdevice *s, comedi_insn *insn, lsampl_t *data) { unsigned short tmp; |