diff options
author | Benjamin Adolphi <b.adolphi@googlemail.com> | 2010-01-28 18:42:30 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-03 19:42:54 -0500 |
commit | 900b78088567d2033c58d4e2433c3d2558f56b76 (patch) | |
tree | a639d6dd168b48cfb12e16b2c8aa4a43d5fa4417 /drivers/staging | |
parent | 94941bc805d2b77e6b548b83529b3fa5e98a3636 (diff) |
Staging: comedi: ni_660x: Checkpatch cleanups
This fixes all checkpatch issues in the ni_660x comedi driver.
Signed-off-by: Benjamin Adolphi <b.adolphi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/comedi/drivers/ni_660x.c | 71 |
1 files changed, 36 insertions, 35 deletions
diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c index 1e204144766..f74fc5e6ba2 100644 --- a/drivers/staging/comedi/drivers/ni_660x.c +++ b/drivers/staging/comedi/drivers/ni_660x.c | |||
@@ -52,7 +52,9 @@ enum ni_660x_constants { | |||
52 | }; | 52 | }; |
53 | 53 | ||
54 | #define NUM_PFI_CHANNELS 40 | 54 | #define NUM_PFI_CHANNELS 40 |
55 | /* really there are only up to 3 dma channels, but the register layout allows for 4 */ | 55 | /* really there are only up to 3 dma channels, but the register layout allows |
56 | for 4 */ | ||
57 | |||
56 | #define MAX_DMA_CHANNEL 4 | 58 | #define MAX_DMA_CHANNEL 4 |
57 | 59 | ||
58 | /* See Register-Level Programmer Manual page 3.1 */ | 60 | /* See Register-Level Programmer Manual page 3.1 */ |
@@ -198,7 +200,7 @@ struct NI_660xRegisterData { | |||
198 | const char *name; /* Register Name */ | 200 | const char *name; /* Register Name */ |
199 | int offset; /* Offset from base address from GPCT chip */ | 201 | int offset; /* Offset from base address from GPCT chip */ |
200 | enum ni_660x_register_direction direction; | 202 | enum ni_660x_register_direction direction; |
201 | enum ni_660x_register_width size; /* 1 byte, 2 bytes, or 4 bytes */ | 203 | enum ni_660x_register_width size; /* 1 byte, 2 bytes, or 4 bytes */ |
202 | }; | 204 | }; |
203 | 205 | ||
204 | static const struct NI_660xRegisterData registerData[NumRegisters] = { | 206 | static const struct NI_660xRegisterData registerData[NumRegisters] = { |
@@ -382,8 +384,8 @@ enum global_interrupt_config_register_bits { | |||
382 | }; | 384 | }; |
383 | 385 | ||
384 | /* Offset of the GPCT chips from the base-adress of the card */ | 386 | /* Offset of the GPCT chips from the base-adress of the card */ |
385 | static const unsigned GPCT_OFFSET[2] = { 0x0, 0x800 }; /* First chip is at base-address + | 387 | /* First chip is at base-address + 0x00, etc. */ |
386 | 0x00, etc. */ | 388 | static const unsigned GPCT_OFFSET[2] = { 0x0, 0x800 }; |
387 | 389 | ||
388 | /* Board description*/ | 390 | /* Board description*/ |
389 | struct ni_660x_board { | 391 | struct ni_660x_board { |
@@ -712,7 +714,7 @@ static enum NI_660x_Register ni_gpct_to_660x_register(enum ni_gpct_register reg) | |||
712 | ni_660x_register = G3InterruptEnable; | 714 | ni_660x_register = G3InterruptEnable; |
713 | break; | 715 | break; |
714 | default: | 716 | default: |
715 | printk("%s: unhandled register 0x%x in switch.\n", | 717 | printk(KERN_WARNING "%s: unhandled register 0x%x in switch.\n", |
716 | __func__, reg); | 718 | __func__, reg); |
717 | BUG(); | 719 | BUG(); |
718 | return 0; | 720 | return 0; |
@@ -737,7 +739,7 @@ static inline void ni_660x_write_register(struct comedi_device *dev, | |||
737 | writel(bits, write_address); | 739 | writel(bits, write_address); |
738 | break; | 740 | break; |
739 | default: | 741 | default: |
740 | printk("%s: %s: bug! unhandled case (reg=0x%x) in switch.\n", | 742 | printk(KERN_WARNING "%s: %s: bug! unhandled case (reg=0x%x) in switch.\n", |
741 | __FILE__, __func__, reg); | 743 | __FILE__, __func__, reg); |
742 | BUG(); | 744 | BUG(); |
743 | break; | 745 | break; |
@@ -760,7 +762,7 @@ static inline unsigned ni_660x_read_register(struct comedi_device *dev, | |||
760 | return readl(read_address); | 762 | return readl(read_address); |
761 | break; | 763 | break; |
762 | default: | 764 | default: |
763 | printk("%s: %s: bug! unhandled case (reg=0x%x) in switch.\n", | 765 | printk(KERN_WARNING "%s: %s: bug! unhandled case (reg=0x%x) in switch.\n", |
764 | __FILE__, __func__, reg); | 766 | __FILE__, __func__, reg); |
765 | BUG(); | 767 | BUG(); |
766 | break; | 768 | break; |
@@ -993,9 +995,9 @@ static int ni_660x_allocate_private(struct comedi_device *dev) | |||
993 | spin_lock_init(&private(dev)->mite_channel_lock); | 995 | spin_lock_init(&private(dev)->mite_channel_lock); |
994 | spin_lock_init(&private(dev)->interrupt_lock); | 996 | spin_lock_init(&private(dev)->interrupt_lock); |
995 | spin_lock_init(&private(dev)->soft_reg_copy_lock); | 997 | spin_lock_init(&private(dev)->soft_reg_copy_lock); |
996 | for (i = 0; i < NUM_PFI_CHANNELS; ++i) { | 998 | for (i = 0; i < NUM_PFI_CHANNELS; ++i) |
997 | private(dev)->pfi_output_selects[i] = pfi_output_select_counter; | 999 | private(dev)->pfi_output_selects[i] = pfi_output_select_counter; |
998 | } | 1000 | |
999 | return 0; | 1001 | return 0; |
1000 | } | 1002 | } |
1001 | 1003 | ||
@@ -1008,9 +1010,8 @@ static int ni_660x_alloc_mite_rings(struct comedi_device *dev) | |||
1008 | for (j = 0; j < counters_per_chip; ++j) { | 1010 | for (j = 0; j < counters_per_chip; ++j) { |
1009 | private(dev)->mite_rings[i][j] = | 1011 | private(dev)->mite_rings[i][j] = |
1010 | mite_alloc_ring(private(dev)->mite); | 1012 | mite_alloc_ring(private(dev)->mite); |
1011 | if (private(dev)->mite_rings[i][j] == NULL) { | 1013 | if (private(dev)->mite_rings[i][j] == NULL) |
1012 | return -ENOMEM; | 1014 | return -ENOMEM; |
1013 | } | ||
1014 | } | 1015 | } |
1015 | } | 1016 | } |
1016 | return 0; | 1017 | return 0; |
@@ -1022,9 +1023,8 @@ static void ni_660x_free_mite_rings(struct comedi_device *dev) | |||
1022 | unsigned j; | 1023 | unsigned j; |
1023 | 1024 | ||
1024 | for (i = 0; i < board(dev)->n_chips; ++i) { | 1025 | for (i = 0; i < board(dev)->n_chips; ++i) { |
1025 | for (j = 0; j < counters_per_chip; ++j) { | 1026 | for (j = 0; j < counters_per_chip; ++j) |
1026 | mite_free_ring(private(dev)->mite_rings[i][j]); | 1027 | mite_free_ring(private(dev)->mite_rings[i][j]); |
1027 | } | ||
1028 | } | 1028 | } |
1029 | } | 1029 | } |
1030 | 1030 | ||
@@ -1036,7 +1036,7 @@ static int ni_660x_attach(struct comedi_device *dev, | |||
1036 | unsigned i; | 1036 | unsigned i; |
1037 | unsigned global_interrupt_config_bits; | 1037 | unsigned global_interrupt_config_bits; |
1038 | 1038 | ||
1039 | printk("comedi%d: ni_660x: ", dev->minor); | 1039 | printk(KERN_INFO "comedi%d: ni_660x: ", dev->minor); |
1040 | 1040 | ||
1041 | ret = ni_660x_allocate_private(dev); | 1041 | ret = ni_660x_allocate_private(dev); |
1042 | if (ret < 0) | 1042 | if (ret < 0) |
@@ -1049,7 +1049,7 @@ static int ni_660x_attach(struct comedi_device *dev, | |||
1049 | 1049 | ||
1050 | ret = mite_setup2(private(dev)->mite, 1); | 1050 | ret = mite_setup2(private(dev)->mite, 1); |
1051 | if (ret < 0) { | 1051 | if (ret < 0) { |
1052 | printk("error setting up mite\n"); | 1052 | printk(KERN_WARNING "error setting up mite\n"); |
1053 | return ret; | 1053 | return ret; |
1054 | } | 1054 | } |
1055 | comedi_set_hw_dev(dev, &private(dev)->mite->pcidev->dev); | 1055 | comedi_set_hw_dev(dev, &private(dev)->mite->pcidev->dev); |
@@ -1057,7 +1057,7 @@ static int ni_660x_attach(struct comedi_device *dev, | |||
1057 | if (ret < 0) | 1057 | if (ret < 0) |
1058 | return ret; | 1058 | return ret; |
1059 | 1059 | ||
1060 | printk(" %s ", dev->board_name); | 1060 | printk(KERN_INFO " %s ", dev->board_name); |
1061 | 1061 | ||
1062 | dev->n_subdevices = 2 + NI_660X_MAX_NUM_COUNTERS; | 1062 | dev->n_subdevices = 2 + NI_660X_MAX_NUM_COUNTERS; |
1063 | 1063 | ||
@@ -1078,15 +1078,17 @@ static int ni_660x_attach(struct comedi_device *dev, | |||
1078 | s->insn_bits = ni_660x_dio_insn_bits; | 1078 | s->insn_bits = ni_660x_dio_insn_bits; |
1079 | s->insn_config = ni_660x_dio_insn_config; | 1079 | s->insn_config = ni_660x_dio_insn_config; |
1080 | s->io_bits = 0; /* all bits default to input */ | 1080 | s->io_bits = 0; /* all bits default to input */ |
1081 | /* we use the ioconfig registers to control dio direction, so zero output enables in stc dio control reg */ | 1081 | /* we use the ioconfig registers to control dio direction, so zero |
1082 | output enables in stc dio control reg */ | ||
1082 | ni_660x_write_register(dev, 0, 0, STCDIOControl); | 1083 | ni_660x_write_register(dev, 0, 0, STCDIOControl); |
1083 | 1084 | ||
1084 | private(dev)->counter_dev = ni_gpct_device_construct(dev, | 1085 | private(dev)->counter_dev |
1085 | &ni_gpct_write_register, | 1086 | = ni_gpct_device_construct(dev, |
1086 | &ni_gpct_read_register, | 1087 | &ni_gpct_write_register, |
1087 | ni_gpct_variant_660x, | 1088 | &ni_gpct_read_register, |
1088 | ni_660x_num_counters | 1089 | ni_gpct_variant_660x, |
1089 | (dev)); | 1090 | ni_660x_num_counters |
1091 | (dev)); | ||
1090 | if (private(dev)->counter_dev == NULL) | 1092 | if (private(dev)->counter_dev == NULL) |
1091 | return -ENOMEM; | 1093 | return -ENOMEM; |
1092 | for (i = 0; i < NI_660X_MAX_NUM_COUNTERS; ++i) { | 1094 | for (i = 0; i < NI_660X_MAX_NUM_COUNTERS; ++i) { |
@@ -1118,12 +1120,12 @@ static int ni_660x_attach(struct comedi_device *dev, | |||
1118 | s->type = COMEDI_SUBD_UNUSED; | 1120 | s->type = COMEDI_SUBD_UNUSED; |
1119 | } | 1121 | } |
1120 | } | 1122 | } |
1121 | for (i = 0; i < board(dev)->n_chips; ++i) { | 1123 | for (i = 0; i < board(dev)->n_chips; ++i) |
1122 | init_tio_chip(dev, i); | 1124 | init_tio_chip(dev, i); |
1123 | } | 1125 | |
1124 | for (i = 0; i < ni_660x_num_counters(dev); ++i) { | 1126 | for (i = 0; i < ni_660x_num_counters(dev); ++i) |
1125 | ni_tio_init_counter(&private(dev)->counter_dev->counters[i]); | 1127 | ni_tio_init_counter(&private(dev)->counter_dev->counters[i]); |
1126 | } | 1128 | |
1127 | for (i = 0; i < NUM_PFI_CHANNELS; ++i) { | 1129 | for (i = 0; i < NUM_PFI_CHANNELS; ++i) { |
1128 | if (i < min_counter_pfi_chan) | 1130 | if (i < min_counter_pfi_chan) |
1129 | ni_660x_set_pfi_routing(dev, i, pfi_output_select_do); | 1131 | ni_660x_set_pfi_routing(dev, i, pfi_output_select_do); |
@@ -1134,13 +1136,13 @@ static int ni_660x_attach(struct comedi_device *dev, | |||
1134 | } | 1136 | } |
1135 | /* to be safe, set counterswap bits on tio chips after all the counter | 1137 | /* to be safe, set counterswap bits on tio chips after all the counter |
1136 | outputs have been set to high impedance mode */ | 1138 | outputs have been set to high impedance mode */ |
1137 | for (i = 0; i < board(dev)->n_chips; ++i) { | 1139 | for (i = 0; i < board(dev)->n_chips; ++i) |
1138 | set_tio_counterswap(dev, i); | 1140 | set_tio_counterswap(dev, i); |
1139 | } | 1141 | |
1140 | ret = request_irq(mite_irq(private(dev)->mite), ni_660x_interrupt, | 1142 | ret = request_irq(mite_irq(private(dev)->mite), ni_660x_interrupt, |
1141 | IRQF_SHARED, "ni_660x", dev); | 1143 | IRQF_SHARED, "ni_660x", dev); |
1142 | if (ret < 0) { | 1144 | if (ret < 0) { |
1143 | printk(" irq not available\n"); | 1145 | printk(KERN_WARNING " irq not available\n"); |
1144 | return ret; | 1146 | return ret; |
1145 | } | 1147 | } |
1146 | dev->irq = mite_irq(private(dev)->mite); | 1148 | dev->irq = mite_irq(private(dev)->mite); |
@@ -1149,13 +1151,13 @@ static int ni_660x_attach(struct comedi_device *dev, | |||
1149 | global_interrupt_config_bits |= Cascade_Int_Enable_Bit; | 1151 | global_interrupt_config_bits |= Cascade_Int_Enable_Bit; |
1150 | ni_660x_write_register(dev, 0, global_interrupt_config_bits, | 1152 | ni_660x_write_register(dev, 0, global_interrupt_config_bits, |
1151 | GlobalInterruptConfigRegister); | 1153 | GlobalInterruptConfigRegister); |
1152 | printk("attached\n"); | 1154 | printk(KERN_INFO "attached\n"); |
1153 | return 0; | 1155 | return 0; |
1154 | } | 1156 | } |
1155 | 1157 | ||
1156 | static int ni_660x_detach(struct comedi_device *dev) | 1158 | static int ni_660x_detach(struct comedi_device *dev) |
1157 | { | 1159 | { |
1158 | printk("comedi%d: ni_660x: remove\n", dev->minor); | 1160 | printk(KERN_INFO "comedi%d: ni_660x: remove\n", dev->minor); |
1159 | 1161 | ||
1160 | /* Free irq */ | 1162 | /* Free irq */ |
1161 | if (dev->irq) | 1163 | if (dev->irq) |
@@ -1193,9 +1195,8 @@ static void init_tio_chip(struct comedi_device *dev, int chipset) | |||
1193 | private(dev)-> | 1195 | private(dev)-> |
1194 | dma_configuration_soft_copies[chipset], | 1196 | dma_configuration_soft_copies[chipset], |
1195 | DMAConfigRegister); | 1197 | DMAConfigRegister); |
1196 | for (i = 0; i < NUM_PFI_CHANNELS; ++i) { | 1198 | for (i = 0; i < NUM_PFI_CHANNELS; ++i) |
1197 | ni_660x_write_register(dev, chipset, 0, IOConfigReg(i)); | 1199 | ni_660x_write_register(dev, chipset, 0, IOConfigReg(i)); |
1198 | } | ||
1199 | } | 1200 | } |
1200 | 1201 | ||
1201 | static int | 1202 | static int |
@@ -1234,7 +1235,7 @@ static int ni_660x_find_device(struct comedi_device *dev, int bus, int slot) | |||
1234 | } | 1235 | } |
1235 | } | 1236 | } |
1236 | } | 1237 | } |
1237 | printk("no device found\n"); | 1238 | printk(KERN_WARNING "no device found\n"); |
1238 | mite_list_devices(); | 1239 | mite_list_devices(); |
1239 | return -EIO; | 1240 | return -EIO; |
1240 | } | 1241 | } |