diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2009-04-09 16:07:21 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-19 14:00:31 -0400 |
commit | 53106ae68acf6eda9593150a25fc44e30fd5ff68 (patch) | |
tree | 5aed2d7b59b67d04bc7d1b016ef4e2e560b7bdf3 /drivers/staging/comedi | |
parent | f7cbd7aad063b2a4b7aff6a743b2b00015ce3c3e (diff) |
Staging Comedi: fix spacing around parens
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi')
22 files changed, 75 insertions, 75 deletions
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c index 6e13e450dc7..cabbf090f60 100644 --- a/drivers/staging/comedi/drivers.c +++ b/drivers/staging/comedi/drivers.c | |||
@@ -198,7 +198,7 @@ int comedi_driver_unregister(struct comedi_driver *driver) | |||
198 | struct comedi_device_file_info *dev_file_info = comedi_get_device_file_info(i); | 198 | struct comedi_device_file_info *dev_file_info = comedi_get_device_file_info(i); |
199 | struct comedi_device *dev; | 199 | struct comedi_device *dev; |
200 | 200 | ||
201 | if(dev_file_info == NULL) continue; | 201 | if (dev_file_info == NULL) continue; |
202 | dev = dev_file_info->device; | 202 | dev = dev_file_info->device; |
203 | 203 | ||
204 | mutex_lock(&dev->mutex); | 204 | mutex_lock(&dev->mutex); |
@@ -801,7 +801,7 @@ int comedi_auto_config(struct device *hardware_device, const char *board_name, c | |||
801 | } | 801 | } |
802 | 802 | ||
803 | minor = comedi_alloc_board_minor(hardware_device); | 803 | minor = comedi_alloc_board_minor(hardware_device); |
804 | if(minor < 0) return minor; | 804 | if (minor < 0) return minor; |
805 | 805 | ||
806 | private_data = kmalloc(sizeof(unsigned), GFP_KERNEL); | 806 | private_data = kmalloc(sizeof(unsigned), GFP_KERNEL); |
807 | if (private_data == NULL) { | 807 | if (private_data == NULL) { |
@@ -824,7 +824,7 @@ int comedi_auto_config(struct device *hardware_device, const char *board_name, c | |||
824 | mutex_unlock(&dev_file_info->device->mutex); | 824 | mutex_unlock(&dev_file_info->device->mutex); |
825 | 825 | ||
826 | cleanup: | 826 | cleanup: |
827 | if(retval < 0) | 827 | if (retval < 0) |
828 | { | 828 | { |
829 | kfree(private_data); | 829 | kfree(private_data); |
830 | comedi_free_board_minor(minor); | 830 | comedi_free_board_minor(minor); |
@@ -835,7 +835,7 @@ cleanup: | |||
835 | void comedi_auto_unconfig(struct device *hardware_device) | 835 | void comedi_auto_unconfig(struct device *hardware_device) |
836 | { | 836 | { |
837 | unsigned *minor = (unsigned *)dev_get_drvdata(hardware_device); | 837 | unsigned *minor = (unsigned *)dev_get_drvdata(hardware_device); |
838 | if(minor == NULL) return; | 838 | if (minor == NULL) return; |
839 | 839 | ||
840 | BUG_ON(*minor >= COMEDI_NUM_BOARD_MINORS); | 840 | BUG_ON(*minor >= COMEDI_NUM_BOARD_MINORS); |
841 | 841 | ||
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c index a35f299f2a2..f9c27efe1dc 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_common.c +++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c | |||
@@ -2638,7 +2638,7 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
2638 | devpriv->i_IobaseReserved = (int) io_addr[3]; | 2638 | devpriv->i_IobaseReserved = (int) io_addr[3]; |
2639 | printk("\nioremap begin"); | 2639 | printk("\nioremap begin"); |
2640 | devpriv->dw_AiBase = | 2640 | devpriv->dw_AiBase = |
2641 | (unsigned long ) ioremap(io_addr[3], | 2641 | (unsigned long) ioremap(io_addr[3], |
2642 | this_board->i_IorangeBase3); | 2642 | this_board->i_IorangeBase3); |
2643 | printk("\nioremap end"); | 2643 | printk("\nioremap end"); |
2644 | } | 2644 | } |
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c index 3aa20928e67..3c9bb3962c5 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c +++ b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c | |||
@@ -45,9 +45,9 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc | |||
45 | +----------+-----------+------------------------------------------------+ | 45 | +----------+-----------+------------------------------------------------+ |
46 | */ | 46 | */ |
47 | 47 | ||
48 | #define NVCMD_BEGIN_READ (0x7 << 5 ) /* nvRam begin read command */ | 48 | #define NVCMD_BEGIN_READ (0x7 << 5) /* nvRam begin read command */ |
49 | #define NVCMD_LOAD_LOW (0x4 << 5 ) /* nvRam load low command */ | 49 | #define NVCMD_LOAD_LOW (0x4 << 5) /* nvRam load low command */ |
50 | #define NVCMD_LOAD_HIGH (0x5 << 5 ) /* nvRam load high command */ | 50 | #define NVCMD_LOAD_HIGH (0x5 << 5) /* nvRam load high command */ |
51 | #define EE76_CMD_LEN 13 /* bits in instructions */ | 51 | #define EE76_CMD_LEN 13 /* bits in instructions */ |
52 | #define EE_READ 0x0180 /* 01 1000 0000 read instruction */ | 52 | #define EE_READ 0x0180 /* 01 1000 0000 read instruction */ |
53 | 53 | ||
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h index ab3a46dc133..fedfc9c58a8 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h | |||
@@ -161,7 +161,7 @@ static const struct comedi_lrange range_apci3120_ao = { 2, { | |||
161 | 161 | ||
162 | #define APCI3120_TIMER2_SELECT_EOS 0xC0 /* ADDED on 20-6 */ | 162 | #define APCI3120_TIMER2_SELECT_EOS 0xC0 /* ADDED on 20-6 */ |
163 | #define APCI3120_COUNTER 3 /* on 20-6 */ | 163 | #define APCI3120_COUNTER 3 /* on 20-6 */ |
164 | #define APCI3120_DISABLE_ALL_TIMER ( APCI3120_DISABLE_TIMER0 & APCI3120_DISABLE_TIMER1 & APCI3120_DISABLE_TIMER2 ) /* on 20-6 */ | 164 | #define APCI3120_DISABLE_ALL_TIMER (APCI3120_DISABLE_TIMER0 & APCI3120_DISABLE_TIMER1 & APCI3120_DISABLE_TIMER2) /* on 20-6 */ |
165 | 165 | ||
166 | #define MAX_ANALOGINPUT_CHANNELS 32 | 166 | #define MAX_ANALOGINPUT_CHANNELS 32 |
167 | 167 | ||
diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c index a792a5b33e6..aed4a47a798 100644 --- a/drivers/staging/comedi/drivers/adl_pci9111.c +++ b/drivers/staging/comedi/drivers/adl_pci9111.c | |||
@@ -252,15 +252,15 @@ TODO: | |||
252 | 252 | ||
253 | #define pci9111_8254_counter_0_set(data) \ | 253 | #define pci9111_8254_counter_0_set(data) \ |
254 | outb(data & 0xFF, PCI9111_IO_BASE+PCI9111_REGISTER_8254_COUNTER_0); \ | 254 | outb(data & 0xFF, PCI9111_IO_BASE+PCI9111_REGISTER_8254_COUNTER_0); \ |
255 | outb( (data >> 8) & 0xFF, PCI9111_IO_BASE+PCI9111_REGISTER_8254_COUNTER_0) | 255 | outb((data >> 8) & 0xFF, PCI9111_IO_BASE+PCI9111_REGISTER_8254_COUNTER_0) |
256 | 256 | ||
257 | #define pci9111_8254_counter_1_set(data) \ | 257 | #define pci9111_8254_counter_1_set(data) \ |
258 | outb(data & 0xFF, PCI9111_IO_BASE+PCI9111_REGISTER_8254_COUNTER_1); \ | 258 | outb(data & 0xFF, PCI9111_IO_BASE+PCI9111_REGISTER_8254_COUNTER_1); \ |
259 | outb( (data >> 8) & 0xFF, PCI9111_IO_BASE+PCI9111_REGISTER_8254_COUNTER_1) | 259 | outb((data >> 8) & 0xFF, PCI9111_IO_BASE+PCI9111_REGISTER_8254_COUNTER_1) |
260 | 260 | ||
261 | #define pci9111_8254_counter_2_set(data) \ | 261 | #define pci9111_8254_counter_2_set(data) \ |
262 | outb(data & 0xFF, PCI9111_IO_BASE+PCI9111_REGISTER_8254_COUNTER_2); \ | 262 | outb(data & 0xFF, PCI9111_IO_BASE+PCI9111_REGISTER_8254_COUNTER_2); \ |
263 | outb( (data >> 8) & 0xFF, PCI9111_IO_BASE+PCI9111_REGISTER_8254_COUNTER_2) | 263 | outb((data >> 8) & 0xFF, PCI9111_IO_BASE+PCI9111_REGISTER_8254_COUNTER_2) |
264 | 264 | ||
265 | /* Function prototypes */ | 265 | /* Function prototypes */ |
266 | 266 | ||
diff --git a/drivers/staging/comedi/drivers/adq12b.c b/drivers/staging/comedi/drivers/adq12b.c index b9359c57248..8fe4c0b0e8f 100644 --- a/drivers/staging/comedi/drivers/adq12b.c +++ b/drivers/staging/comedi/drivers/adq12b.c | |||
@@ -101,17 +101,17 @@ If you do not specify any options, they will default to | |||
101 | 101 | ||
102 | // available ranges through the PGA gains | 102 | // available ranges through the PGA gains |
103 | static const struct comedi_lrange range_adq12b_ai_bipolar = { 4, { | 103 | static const struct comedi_lrange range_adq12b_ai_bipolar = { 4, { |
104 | BIP_RANGE( 5 ), | 104 | BIP_RANGE(5), |
105 | BIP_RANGE( 2 ), | 105 | BIP_RANGE(2), |
106 | BIP_RANGE( 1 ), | 106 | BIP_RANGE(1), |
107 | BIP_RANGE( 0.5 ) | 107 | BIP_RANGE(0.5) |
108 | }}; | 108 | }}; |
109 | 109 | ||
110 | static const struct comedi_lrange range_adq12b_ai_unipolar = { 4, { | 110 | static const struct comedi_lrange range_adq12b_ai_unipolar = { 4, { |
111 | UNI_RANGE( 5 ), | 111 | UNI_RANGE(5), |
112 | UNI_RANGE( 2 ), | 112 | UNI_RANGE(2), |
113 | UNI_RANGE( 1 ), | 113 | UNI_RANGE(1), |
114 | UNI_RANGE( 0.5 ) | 114 | UNI_RANGE(0.5) |
115 | }}; | 115 | }}; |
116 | 116 | ||
117 | 117 | ||
@@ -219,7 +219,7 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
219 | * Allocate the private structure area. alloc_private() is a | 219 | * Allocate the private structure area. alloc_private() is a |
220 | * convenient macro defined in comedidev.h. | 220 | * convenient macro defined in comedidev.h. |
221 | */ | 221 | */ |
222 | if(alloc_private(dev, sizeof(struct adq12b_private)) < 0) | 222 | if (alloc_private (dev, sizeof (struct adq12b_private)) < 0) |
223 | return -ENOMEM; | 223 | return -ENOMEM; |
224 | 224 | ||
225 | /* fill in devpriv structure */ | 225 | /* fill in devpriv structure */ |
@@ -236,7 +236,7 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
236 | * Allocate the subdevice structures. alloc_subdevice() is a | 236 | * Allocate the subdevice structures. alloc_subdevice() is a |
237 | * convenient macro defined in comedidev.h. | 237 | * convenient macro defined in comedidev.h. |
238 | */ | 238 | */ |
239 | if(alloc_subdevices(dev, 3)<0) | 239 | if (alloc_subdevices (dev, 3)<0) |
240 | return -ENOMEM; | 240 | return -ENOMEM; |
241 | 241 | ||
242 | s = dev->subdevices+0; | 242 | s = dev->subdevices+0; |
@@ -332,7 +332,7 @@ static int adq12b_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s | |||
332 | status = inb(dev->iobase + ADQ12B_ADLOW); | 332 | status = inb(dev->iobase + ADQ12B_ADLOW); |
333 | 333 | ||
334 | /* convert n samples */ | 334 | /* convert n samples */ |
335 | for(n=0; n < insn->n; n++){ | 335 | for (n=0; n < insn->n; n++){ |
336 | 336 | ||
337 | /* wait for end of convertion */ | 337 | /* wait for end of convertion */ |
338 | i = 0; | 338 | i = 0; |
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c index 2df5ab0eaee..37f1459d152 100644 --- a/drivers/staging/comedi/drivers/adv_pci1710.c +++ b/drivers/staging/comedi/drivers/adv_pci1710.c | |||
@@ -1347,20 +1347,20 @@ static int pci1710_attach(struct comedi_device *dev, struct comedi_devconfig *it | |||
1347 | board_index = this_board - boardtypes; | 1347 | board_index = this_board - boardtypes; |
1348 | while (NULL != (pcidev = pci_get_device(PCI_VENDOR_ID_ADVANTECH, | 1348 | while (NULL != (pcidev = pci_get_device(PCI_VENDOR_ID_ADVANTECH, |
1349 | PCI_ANY_ID, pcidev))) { | 1349 | PCI_ANY_ID, pcidev))) { |
1350 | if(strcmp(this_board->name, DRV_NAME) == 0) | 1350 | if (strcmp (this_board->name, DRV_NAME) == 0) |
1351 | { | 1351 | { |
1352 | for(i = 0; i < n_boardtypes; ++i) | 1352 | for (i = 0; i < n_boardtypes; ++i) |
1353 | { | 1353 | { |
1354 | if(pcidev->device == boardtypes[i].device_id) | 1354 | if (pcidev->device == boardtypes[i].device_id) |
1355 | { | 1355 | { |
1356 | board_index = i; | 1356 | board_index = i; |
1357 | break; | 1357 | break; |
1358 | } | 1358 | } |
1359 | } | 1359 | } |
1360 | if(i == n_boardtypes) continue; | 1360 | if (i == n_boardtypes) continue; |
1361 | }else | 1361 | }else |
1362 | { | 1362 | { |
1363 | if(pcidev->device != boardtypes[board_index].device_id) continue; | 1363 | if (pcidev->device != boardtypes[board_index].device_id) continue; |
1364 | } | 1364 | } |
1365 | 1365 | ||
1366 | /* Found matching vendor/device. */ | 1366 | /* Found matching vendor/device. */ |
diff --git a/drivers/staging/comedi/drivers/am9513.h b/drivers/staging/comedi/drivers/am9513.h index 386226e5b17..73367d6afff 100644 --- a/drivers/staging/comedi/drivers/am9513.h +++ b/drivers/staging/comedi/drivers/am9513.h | |||
@@ -51,14 +51,14 @@ | |||
51 | Am9513_output_control(reg); \ | 51 | Am9513_output_control(reg); \ |
52 | Am9513_output_data(val>>8); \ | 52 | Am9513_output_data(val>>8); \ |
53 | Am9513_output_data(val&0xff); \ | 53 | Am9513_output_data(val&0xff); \ |
54 | }while(0) | 54 | }while (0) |
55 | 55 | ||
56 | #define Am9513_read_register(reg, val) \ | 56 | #define Am9513_read_register(reg, val) \ |
57 | do{ \ | 57 | do{ \ |
58 | Am9513_output_control(reg); \ | 58 | Am9513_output_control(reg); \ |
59 | val=Am9513_input_data()<<8; \ | 59 | val=Am9513_input_data()<<8; \ |
60 | val|=Am9513_input_data(); \ | 60 | val|=Am9513_input_data(); \ |
61 | }while(0) | 61 | }while (0) |
62 | 62 | ||
63 | #else /* Am9513_16BITBUS */ | 63 | #else /* Am9513_16BITBUS */ |
64 | 64 | ||
@@ -66,13 +66,13 @@ | |||
66 | do{ \ | 66 | do{ \ |
67 | Am9513_output_control(reg); \ | 67 | Am9513_output_control(reg); \ |
68 | Am9513_output_data(val); \ | 68 | Am9513_output_data(val); \ |
69 | }while(0) | 69 | }while (0) |
70 | 70 | ||
71 | #define Am9513_read_register(reg, val) \ | 71 | #define Am9513_read_register(reg, val) \ |
72 | do{ \ | 72 | do{ \ |
73 | Am9513_output_control(reg); \ | 73 | Am9513_output_control(reg); \ |
74 | val=Am9513_input_data(); \ | 74 | val=Am9513_input_data(); \ |
75 | }while(0) | 75 | }while (0) |
76 | 76 | ||
77 | #endif | 77 | #endif |
78 | 78 | ||
diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c index c45cbf36f1e..4efdd125963 100644 --- a/drivers/staging/comedi/drivers/amplc_pc236.c +++ b/drivers/staging/comedi/drivers/amplc_pc236.c | |||
@@ -77,19 +77,19 @@ unused. | |||
77 | * INTCSR values for PCI236. | 77 | * INTCSR values for PCI236. |
78 | */ | 78 | */ |
79 | /* Disable interrupt, also clear any interrupt there */ | 79 | /* Disable interrupt, also clear any interrupt there */ |
80 | #define PCI236_INTR_DISABLE ( PLX9052_INTCSR_LI1ENAB_DISABLED \ | 80 | #define PCI236_INTR_DISABLE (PLX9052_INTCSR_LI1ENAB_DISABLED \ |
81 | | PLX9052_INTCSR_LI1POL_HIGH \ | 81 | | PLX9052_INTCSR_LI1POL_HIGH \ |
82 | | PLX9052_INTCSR_LI2POL_HIGH \ | 82 | | PLX9052_INTCSR_LI2POL_HIGH \ |
83 | | PLX9052_INTCSR_PCIENAB_DISABLED \ | 83 | | PLX9052_INTCSR_PCIENAB_DISABLED \ |
84 | | PLX9052_INTCSR_LI1SEL_EDGE \ | 84 | | PLX9052_INTCSR_LI1SEL_EDGE \ |
85 | | PLX9052_INTCSR_LI1CLRINT_ASSERTED ) | 85 | | PLX9052_INTCSR_LI1CLRINT_ASSERTED) |
86 | /* Enable interrupt, also clear any interrupt there. */ | 86 | /* Enable interrupt, also clear any interrupt there. */ |
87 | #define PCI236_INTR_ENABLE ( PLX9052_INTCSR_LI1ENAB_ENABLED \ | 87 | #define PCI236_INTR_ENABLE (PLX9052_INTCSR_LI1ENAB_ENABLED \ |
88 | | PLX9052_INTCSR_LI1POL_HIGH \ | 88 | | PLX9052_INTCSR_LI1POL_HIGH \ |
89 | | PLX9052_INTCSR_LI2POL_HIGH \ | 89 | | PLX9052_INTCSR_LI2POL_HIGH \ |
90 | | PLX9052_INTCSR_PCIENAB_ENABLED \ | 90 | | PLX9052_INTCSR_PCIENAB_ENABLED \ |
91 | | PLX9052_INTCSR_LI1SEL_EDGE \ | 91 | | PLX9052_INTCSR_LI1SEL_EDGE \ |
92 | | PLX9052_INTCSR_LI1CLRINT_ASSERTED ) | 92 | | PLX9052_INTCSR_LI1CLRINT_ASSERTED) |
93 | 93 | ||
94 | /* | 94 | /* |
95 | * Board descriptions for Amplicon PC36AT and PCI236. | 95 | * Board descriptions for Amplicon PC36AT and PCI236. |
diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c index ba465c43240..425c0f29645 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas64.c +++ b/drivers/staging/comedi/drivers/cb_pcidas64.c | |||
@@ -98,7 +98,7 @@ TODO: | |||
98 | /* #define PCIDAS64_DEBUG enable debugging code */ | 98 | /* #define PCIDAS64_DEBUG enable debugging code */ |
99 | 99 | ||
100 | #ifdef PCIDAS64_DEBUG | 100 | #ifdef PCIDAS64_DEBUG |
101 | #define DEBUG_PRINT(format, args...) rt_printk(format , ## args ) | 101 | #define DEBUG_PRINT(format, args...) rt_printk(format , ## args) |
102 | #else | 102 | #else |
103 | #define DEBUG_PRINT(format, args...) | 103 | #define DEBUG_PRINT(format, args...) |
104 | #endif | 104 | #endif |
diff --git a/drivers/staging/comedi/drivers/dt282x.c b/drivers/staging/comedi/drivers/dt282x.c index 643af376087..66328353fda 100644 --- a/drivers/staging/comedi/drivers/dt282x.c +++ b/drivers/staging/comedi/drivers/dt282x.c | |||
@@ -387,12 +387,12 @@ struct dt282x_private { | |||
387 | #define wait_for(a, b) \ | 387 | #define wait_for(a, b) \ |
388 | do{ \ | 388 | do{ \ |
389 | int _i; \ | 389 | int _i; \ |
390 | for(_i=0;_i<DT2821_TIMEOUT;_i++){ \ | 390 | for (_i=0;_i<DT2821_TIMEOUT;_i++){ \ |
391 | if(a){_i=0;break;} \ | 391 | if (a){_i=0;break;} \ |
392 | comedi_udelay(5); \ | 392 | comedi_udelay(5); \ |
393 | } \ | 393 | } \ |
394 | if(_i){b} \ | 394 | if (_i){b} \ |
395 | }while(0) | 395 | }while (0) |
396 | 396 | ||
397 | static int dt282x_attach(struct comedi_device *dev, struct comedi_devconfig *it); | 397 | static int dt282x_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
398 | static int dt282x_detach(struct comedi_device *dev); | 398 | static int dt282x_detach(struct comedi_device *dev); |
@@ -1029,7 +1029,7 @@ static int dt282x_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice | |||
1029 | cmd->start_arg = 0; | 1029 | cmd->start_arg = 0; |
1030 | err++; | 1030 | err++; |
1031 | } | 1031 | } |
1032 | if (cmd->scan_begin_arg < 5000 /* XXX unknown */ ) { | 1032 | if (cmd->scan_begin_arg < 5000 /* XXX unknown */) { |
1033 | cmd->scan_begin_arg = 5000; | 1033 | cmd->scan_begin_arg = 5000; |
1034 | err++; | 1034 | err++; |
1035 | } | 1035 | } |
@@ -1302,7 +1302,7 @@ static int dt282x_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
1302 | 1302 | ||
1303 | irq = probe_irq_off(irqs); | 1303 | irq = probe_irq_off(irqs); |
1304 | restore_flags(flags); | 1304 | restore_flags(flags); |
1305 | if (0 /* error */ ) { | 1305 | if (0 /* error */) { |
1306 | printk(" error probing irq (bad)"); | 1306 | printk(" error probing irq (bad)"); |
1307 | } | 1307 | } |
1308 | } | 1308 | } |
diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c index 48491c09e7f..d25b4c8aeae 100644 --- a/drivers/staging/comedi/drivers/gsc_hpdi.c +++ b/drivers/staging/comedi/drivers/gsc_hpdi.c | |||
@@ -66,7 +66,7 @@ static int dio_config_block_size(struct comedi_device * dev, unsigned int * data | |||
66 | /* #define HPDI_DEBUG enable debugging code */ | 66 | /* #define HPDI_DEBUG enable debugging code */ |
67 | 67 | ||
68 | #ifdef HPDI_DEBUG | 68 | #ifdef HPDI_DEBUG |
69 | #define DEBUG_PRINT(format, args...) rt_printk(format , ## args ) | 69 | #define DEBUG_PRINT(format, args...) rt_printk(format , ## args) |
70 | #else | 70 | #else |
71 | #define DEBUG_PRINT(format, args...) | 71 | #define DEBUG_PRINT(format, args...) |
72 | #endif | 72 | #endif |
diff --git a/drivers/staging/comedi/drivers/mpc624.c b/drivers/staging/comedi/drivers/mpc624.c index bd7cb4406e1..a00ad1b63ed 100644 --- a/drivers/staging/comedi/drivers/mpc624.c +++ b/drivers/staging/comedi/drivers/mpc624.c | |||
@@ -110,13 +110,13 @@ Configuration Options: | |||
110 | */ | 110 | */ |
111 | 111 | ||
112 | #define MPC624_SPEED_3_52_kHz (MPC624_OSR4 | MPC624_OSR0) | 112 | #define MPC624_SPEED_3_52_kHz (MPC624_OSR4 | MPC624_OSR0) |
113 | #define MPC624_SPEED_1_76_kHz (MPC624_OSR4 | MPC624_OSR1 ) | 113 | #define MPC624_SPEED_1_76_kHz (MPC624_OSR4 | MPC624_OSR1) |
114 | #define MPC624_SPEED_880_Hz (MPC624_OSR4 | MPC624_OSR1 | MPC624_OSR0) | 114 | #define MPC624_SPEED_880_Hz (MPC624_OSR4 | MPC624_OSR1 | MPC624_OSR0) |
115 | #define MPC624_SPEED_440_Hz (MPC624_OSR4 | MPC624_OSR2 ) | 115 | #define MPC624_SPEED_440_Hz (MPC624_OSR4 | MPC624_OSR2) |
116 | #define MPC624_SPEED_220_Hz (MPC624_OSR4 | MPC624_OSR2 | MPC624_OSR0) | 116 | #define MPC624_SPEED_220_Hz (MPC624_OSR4 | MPC624_OSR2 | MPC624_OSR0) |
117 | #define MPC624_SPEED_110_Hz (MPC624_OSR4 | MPC624_OSR2 | MPC624_OSR1 ) | 117 | #define MPC624_SPEED_110_Hz (MPC624_OSR4 | MPC624_OSR2 | MPC624_OSR1) |
118 | #define MPC624_SPEED_55_Hz (MPC624_OSR4 | MPC624_OSR2 | MPC624_OSR1 | MPC624_OSR0) | 118 | #define MPC624_SPEED_55_Hz (MPC624_OSR4 | MPC624_OSR2 | MPC624_OSR1 | MPC624_OSR0) |
119 | #define MPC624_SPEED_27_5_Hz (MPC624_OSR4 | MPC624_OSR3 ) | 119 | #define MPC624_SPEED_27_5_Hz (MPC624_OSR4 | MPC624_OSR3) |
120 | #define MPC624_SPEED_13_75_Hz (MPC624_OSR4 | MPC624_OSR3 | MPC624_OSR0) | 120 | #define MPC624_SPEED_13_75_Hz (MPC624_OSR4 | MPC624_OSR3 | MPC624_OSR0) |
121 | #define MPC624_SPEED_6_875_Hz (MPC624_OSR4 | MPC624_OSR3 | MPC624_OSR2 | MPC624_OSR1 | MPC624_OSR0) | 121 | #define MPC624_SPEED_6_875_Hz (MPC624_OSR4 | MPC624_OSR3 | MPC624_OSR2 | MPC624_OSR1 | MPC624_OSR0) |
122 | /* ---------------------------------------------------------------------------- */ | 122 | /* ---------------------------------------------------------------------------- */ |
diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c index d4a6cf3dde6..b11f134e8c7 100644 --- a/drivers/staging/comedi/drivers/ni_660x.c +++ b/drivers/staging/comedi/drivers/ni_660x.c | |||
@@ -1161,7 +1161,7 @@ static void init_tio_chip(struct comedi_device *dev, int chipset) | |||
1161 | ni_660x_write_register(dev, chipset, | 1161 | ni_660x_write_register(dev, chipset, |
1162 | private(dev)->dma_configuration_soft_copies[chipset], | 1162 | private(dev)->dma_configuration_soft_copies[chipset], |
1163 | DMAConfigRegister); | 1163 | DMAConfigRegister); |
1164 | for(i = 0; i < NUM_PFI_CHANNELS; ++i) | 1164 | for (i = 0; i < NUM_PFI_CHANNELS; ++i) |
1165 | { | 1165 | { |
1166 | ni_660x_write_register(dev, chipset, 0, IOConfigReg(i)); | 1166 | ni_660x_write_register(dev, chipset, 0, IOConfigReg(i)); |
1167 | } | 1167 | } |
@@ -1237,8 +1237,8 @@ static void ni_660x_select_pfi_output(struct comedi_device *dev, unsigned pfi_ch | |||
1237 | unsigned active_bits; | 1237 | unsigned active_bits; |
1238 | unsigned idle_bits; | 1238 | unsigned idle_bits; |
1239 | 1239 | ||
1240 | if(board(dev)->n_chips > 1) { | 1240 | if (board (dev)->n_chips > 1) { |
1241 | if(output_select == pfi_output_select_counter && | 1241 | if (output_select == pfi_output_select_counter && |
1242 | pfi_channel >= counter_4_7_first_pfi && | 1242 | pfi_channel >= counter_4_7_first_pfi && |
1243 | pfi_channel <= counter_4_7_last_pfi) { | 1243 | pfi_channel <= counter_4_7_last_pfi) { |
1244 | active_chipset = 1; | 1244 | active_chipset = 1; |
@@ -1249,7 +1249,7 @@ static void ni_660x_select_pfi_output(struct comedi_device *dev, unsigned pfi_ch | |||
1249 | } | 1249 | } |
1250 | } | 1250 | } |
1251 | 1251 | ||
1252 | if(idle_chipset != active_chipset) { | 1252 | if (idle_chipset != active_chipset) { |
1253 | idle_bits = ni_660x_read_register(dev, idle_chipset, IOConfigReg(pfi_channel)); | 1253 | idle_bits = ni_660x_read_register(dev, idle_chipset, IOConfigReg(pfi_channel)); |
1254 | idle_bits &= ~pfi_output_select_mask(pfi_channel); | 1254 | idle_bits &= ~pfi_output_select_mask(pfi_channel); |
1255 | idle_bits |= pfi_output_select_bits(pfi_channel, pfi_output_select_high_Z); | 1255 | idle_bits |= pfi_output_select_bits(pfi_channel, pfi_output_select_high_Z); |
diff --git a/drivers/staging/comedi/drivers/ni_atmio16d.c b/drivers/staging/comedi/drivers/ni_atmio16d.c index 442bfe717a1..9fafe0c234d 100644 --- a/drivers/staging/comedi/drivers/ni_atmio16d.c +++ b/drivers/staging/comedi/drivers/ni_atmio16d.c | |||
@@ -417,10 +417,10 @@ static int atmio16d_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s | |||
417 | } else if (cmd->convert_arg < 655360000) { | 417 | } else if (cmd->convert_arg < 655360000) { |
418 | base_clock = CLOCK_100_KHZ; | 418 | base_clock = CLOCK_100_KHZ; |
419 | timer = cmd->convert_arg / 10000; | 419 | timer = cmd->convert_arg / 10000; |
420 | } else if (cmd->convert_arg <= 0xffffffff /* 6553600000 */ ) { | 420 | } else if (cmd->convert_arg <= 0xffffffff /* 6553600000 */) { |
421 | base_clock = CLOCK_10_KHZ; | 421 | base_clock = CLOCK_10_KHZ; |
422 | timer = cmd->convert_arg / 100000; | 422 | timer = cmd->convert_arg / 100000; |
423 | } else if (cmd->convert_arg <= 0xffffffff /* 65536000000 */ ) { | 423 | } else if (cmd->convert_arg <= 0xffffffff /* 65536000000 */) { |
424 | base_clock = CLOCK_1_KHZ; | 424 | base_clock = CLOCK_1_KHZ; |
425 | timer = cmd->convert_arg / 1000000; | 425 | timer = cmd->convert_arg / 1000000; |
426 | } | 426 | } |
@@ -483,10 +483,10 @@ static int atmio16d_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s | |||
483 | } else if (cmd->scan_begin_arg < 655360000) { | 483 | } else if (cmd->scan_begin_arg < 655360000) { |
484 | base_clock = CLOCK_100_KHZ; | 484 | base_clock = CLOCK_100_KHZ; |
485 | timer = cmd->scan_begin_arg / 10000; | 485 | timer = cmd->scan_begin_arg / 10000; |
486 | } else if (cmd->scan_begin_arg < 0xffffffff /* 6553600000 */ ) { | 486 | } else if (cmd->scan_begin_arg < 0xffffffff /* 6553600000 */) { |
487 | base_clock = CLOCK_10_KHZ; | 487 | base_clock = CLOCK_10_KHZ; |
488 | timer = cmd->scan_begin_arg / 100000; | 488 | timer = cmd->scan_begin_arg / 100000; |
489 | } else if (cmd->scan_begin_arg < 0xffffffff /* 65536000000 */ ) { | 489 | } else if (cmd->scan_begin_arg < 0xffffffff /* 65536000000 */) { |
490 | base_clock = CLOCK_1_KHZ; | 490 | base_clock = CLOCK_1_KHZ; |
491 | timer = cmd->scan_begin_arg / 1000000; | 491 | timer = cmd->scan_begin_arg / 1000000; |
492 | } | 492 | } |
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index 5c165cac234..7b0030e853c 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c | |||
@@ -1554,7 +1554,7 @@ static int ni_ai_setup_MITE_dma(struct comedi_device *dev) | |||
1554 | comedi_buf_write_alloc(s->async, s->async->prealloc_bufsz); | 1554 | comedi_buf_write_alloc(s->async, s->async->prealloc_bufsz); |
1555 | 1555 | ||
1556 | comedi_spin_lock_irqsave(&devpriv->mite_channel_lock, flags); | 1556 | comedi_spin_lock_irqsave(&devpriv->mite_channel_lock, flags); |
1557 | if(devpriv->ai_mite_chan == NULL) | 1557 | if (devpriv->ai_mite_chan == NULL) |
1558 | { | 1558 | { |
1559 | comedi_spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags); | 1559 | comedi_spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags); |
1560 | return -EIO; | 1560 | return -EIO; |
@@ -2810,7 +2810,7 @@ static int ni_m_series_ao_config_chanlist(struct comedi_device *dev, | |||
2810 | int i; | 2810 | int i; |
2811 | int invert = 0; | 2811 | int invert = 0; |
2812 | 2812 | ||
2813 | if(timed) { | 2813 | if (timed) { |
2814 | for (i = 0; i < boardtype.n_aochan; ++i) { | 2814 | for (i = 0; i < boardtype.n_aochan; ++i) { |
2815 | devpriv->ao_conf[i] &= ~MSeries_AO_Update_Timed_Bit; | 2815 | devpriv->ao_conf[i] &= ~MSeries_AO_Update_Timed_Bit; |
2816 | ni_writeb(devpriv->ao_conf[i], M_Offset_AO_Config_Bank(i)); | 2816 | ni_writeb(devpriv->ao_conf[i], M_Offset_AO_Config_Bank(i)); |
@@ -2970,11 +2970,11 @@ static int ni_ao_insn_config(struct comedi_device *dev, struct comedi_subdevice | |||
2970 | { | 2970 | { |
2971 | switch (data[0]) { | 2971 | switch (data[0]) { |
2972 | case INSN_CONFIG_GET_HARDWARE_BUFFER_SIZE: | 2972 | case INSN_CONFIG_GET_HARDWARE_BUFFER_SIZE: |
2973 | switch(data[1]) | 2973 | switch (data[1]) |
2974 | { | 2974 | { |
2975 | case COMEDI_OUTPUT: | 2975 | case COMEDI_OUTPUT: |
2976 | data[2] = 1 + boardtype.ao_fifo_depth * sizeof(short); | 2976 | data[2] = 1 + boardtype.ao_fifo_depth * sizeof(short); |
2977 | if(devpriv->mite) data[2] += devpriv->mite->fifo_size; | 2977 | if (devpriv->mite) data[2] += devpriv->mite->fifo_size; |
2978 | break; | 2978 | break; |
2979 | case COMEDI_INPUT: | 2979 | case COMEDI_INPUT: |
2980 | data[2] = 0; | 2980 | data[2] = 0; |
@@ -3139,7 +3139,7 @@ static int ni_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s) | |||
3139 | devpriv->stc_writew(dev, devpriv->ao_mode2, AO_Mode_2_Register); | 3139 | devpriv->stc_writew(dev, devpriv->ao_mode2, AO_Mode_2_Register); |
3140 | switch (cmd->stop_src) { | 3140 | switch (cmd->stop_src) { |
3141 | case TRIG_COUNT: | 3141 | case TRIG_COUNT: |
3142 | if(boardtype.reg_type & ni_reg_m_series_mask) | 3142 | if (boardtype.reg_type & ni_reg_m_series_mask) |
3143 | { | 3143 | { |
3144 | /* this is how the NI example code does it for m-series boards, verified correct with 6259 */ | 3144 | /* this is how the NI example code does it for m-series boards, verified correct with 6259 */ |
3145 | devpriv->stc_writel(dev, cmd->stop_arg - 1, AO_UC_Load_A_Register); | 3145 | devpriv->stc_writel(dev, cmd->stop_arg - 1, AO_UC_Load_A_Register); |
@@ -3422,7 +3422,7 @@ static int ni_ao_reset(struct comedi_device *dev, struct comedi_subdevice *s) | |||
3422 | if (boardtype.reg_type & ni_reg_6xxx_mask) { | 3422 | if (boardtype.reg_type & ni_reg_6xxx_mask) { |
3423 | unsigned immediate_bits = 0; | 3423 | unsigned immediate_bits = 0; |
3424 | unsigned i; | 3424 | unsigned i; |
3425 | for(i = 0; i < s->n_chan; ++i) | 3425 | for (i = 0; i < s->n_chan; ++i) |
3426 | { | 3426 | { |
3427 | immediate_bits |= 1 << i; | 3427 | immediate_bits |= 1 << i; |
3428 | } | 3428 | } |
diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h index a580cf351bd..55c8a1d6686 100644 --- a/drivers/staging/comedi/drivers/ni_stc.h +++ b/drivers/staging/comedi/drivers/ni_stc.h | |||
@@ -262,7 +262,7 @@ enum Joint_Status_2_Bits { | |||
262 | #define AO_Trigger_Once _bit0 | 262 | #define AO_Trigger_Once _bit0 |
263 | 263 | ||
264 | #define AO_Mode_2_Register 39 | 264 | #define AO_Mode_2_Register 39 |
265 | #define AO_FIFO_Mode_Mask ( 0x3 << 14 ) | 265 | #define AO_FIFO_Mode_Mask (0x3 << 14) |
266 | enum AO_FIFO_Mode_Bits { | 266 | enum AO_FIFO_Mode_Bits { |
267 | AO_FIFO_Mode_HF_to_F = (3 << 14), | 267 | AO_FIFO_Mode_HF_to_F = (3 << 14), |
268 | AO_FIFO_Mode_F = (2 << 14), | 268 | AO_FIFO_Mode_F = (2 << 14), |
diff --git a/drivers/staging/comedi/drivers/pcmda12.c b/drivers/staging/comedi/drivers/pcmda12.c index 328be7bd501..f2a959654d6 100644 --- a/drivers/staging/comedi/drivers/pcmda12.c +++ b/drivers/staging/comedi/drivers/pcmda12.c | |||
@@ -55,7 +55,7 @@ Configuration Options: | |||
55 | 55 | ||
56 | #include <linux/pci.h> /* for PCI devices */ | 56 | #include <linux/pci.h> /* for PCI devices */ |
57 | 57 | ||
58 | #define MIN(a, b) ( ((a) < (b)) ? (a) : (b) ) | 58 | #define MIN(a, b) (((a) < (b)) ? (a) : (b)) |
59 | #define SDEV_NO ((int)(s - dev->subdevices)) | 59 | #define SDEV_NO ((int)(s - dev->subdevices)) |
60 | #define CHANS 8 | 60 | #define CHANS 8 |
61 | #define IOSIZE 16 | 61 | #define IOSIZE 16 |
diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c index 0dc51f62bac..849fa4fa4ce 100644 --- a/drivers/staging/comedi/drivers/pcmmio.c +++ b/drivers/staging/comedi/drivers/pcmmio.c | |||
@@ -76,7 +76,7 @@ Configuration Options: | |||
76 | #include "../comedidev.h" | 76 | #include "../comedidev.h" |
77 | #include <linux/pci.h> /* for PCI devices */ | 77 | #include <linux/pci.h> /* for PCI devices */ |
78 | 78 | ||
79 | #define MIN(a, b) ( ((a) < (b)) ? (a) : (b) ) | 79 | #define MIN(a, b) (((a) < (b)) ? (a) : (b)) |
80 | 80 | ||
81 | /* This stuff is all from pcmuio.c -- it refers to the DIO subdevices only */ | 81 | /* This stuff is all from pcmuio.c -- it refers to the DIO subdevices only */ |
82 | #define CHANS_PER_PORT 8 | 82 | #define CHANS_PER_PORT 8 |
diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c index 54971a1cb90..7e442dbd2c1 100644 --- a/drivers/staging/comedi/drivers/pcmuio.c +++ b/drivers/staging/comedi/drivers/pcmuio.c | |||
@@ -79,7 +79,7 @@ Configuration Options: | |||
79 | 79 | ||
80 | #include <linux/pci.h> /* for PCI devices */ | 80 | #include <linux/pci.h> /* for PCI devices */ |
81 | 81 | ||
82 | #define MIN(a, b) ( ((a) < (b)) ? (a) : (b) ) | 82 | #define MIN(a, b) (((a) < (b)) ? (a) : (b)) |
83 | #define CHANS_PER_PORT 8 | 83 | #define CHANS_PER_PORT 8 |
84 | #define PORTS_PER_ASIC 6 | 84 | #define PORTS_PER_ASIC 6 |
85 | #define INTR_PORTS_PER_ASIC 3 | 85 | #define INTR_PORTS_PER_ASIC 3 |
diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c index 700090dc2a8..83af347934b 100644 --- a/drivers/staging/comedi/drivers/rtd520.c +++ b/drivers/staging/comedi/drivers/rtd520.c | |||
@@ -757,15 +757,15 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
757 | continue; | 757 | continue; |
758 | } | 758 | } |
759 | } | 759 | } |
760 | for(i = 0; i < sizeof(rtd520Boards) / sizeof(rtd520Boards[0]); ++i) | 760 | for (i = 0; i < sizeof (rtd520Boards) / sizeof (rtd520Boards[0]); ++i) |
761 | { | 761 | { |
762 | if(pcidev->device == rtd520Boards[i].device_id) | 762 | if (pcidev->device == rtd520Boards[i].device_id) |
763 | { | 763 | { |
764 | dev->board_ptr = &rtd520Boards[i]; | 764 | dev->board_ptr = &rtd520Boards[i]; |
765 | break; | 765 | break; |
766 | } | 766 | } |
767 | } | 767 | } |
768 | if(dev->board_ptr) break; /* found one */ | 768 | if (dev->board_ptr) break; /* found one */ |
769 | } | 769 | } |
770 | if (!pcidev) { | 770 | if (!pcidev) { |
771 | if (it->options[0] && it->options[1]) { | 771 | if (it->options[0] && it->options[1]) { |
@@ -931,7 +931,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
931 | printk("( irq=%u )", dev->irq); | 931 | printk("( irq=%u )", dev->irq); |
932 | 932 | ||
933 | ret = rtd520_probe_fifo_depth(dev); | 933 | ret = rtd520_probe_fifo_depth(dev); |
934 | if(ret < 0) { | 934 | if (ret < 0) { |
935 | return ret; | 935 | return ret; |
936 | } | 936 | } |
937 | devpriv->fifoLen = ret; | 937 | devpriv->fifoLen = ret; |
@@ -1226,18 +1226,18 @@ static int rtd520_probe_fifo_depth(struct comedi_device *dev) | |||
1226 | RtdAdcStart(dev); | 1226 | RtdAdcStart(dev); |
1227 | comedi_udelay(1); | 1227 | comedi_udelay(1); |
1228 | fifo_status = RtdFifoStatus(dev); | 1228 | fifo_status = RtdFifoStatus(dev); |
1229 | if((fifo_status & FS_ADC_HEMPTY) == 0) { | 1229 | if ((fifo_status & FS_ADC_HEMPTY) == 0) { |
1230 | fifo_size = 2 * i; | 1230 | fifo_size = 2 * i; |
1231 | break; | 1231 | break; |
1232 | } | 1232 | } |
1233 | } | 1233 | } |
1234 | if(i == limit) | 1234 | if (i == limit) |
1235 | { | 1235 | { |
1236 | rt_printk("\ncomedi: %s: failed to probe fifo size.\n", DRV_NAME); | 1236 | rt_printk("\ncomedi: %s: failed to probe fifo size.\n", DRV_NAME); |
1237 | return -EIO; | 1237 | return -EIO; |
1238 | } | 1238 | } |
1239 | RtdAdcClearFifo(dev); | 1239 | RtdAdcClearFifo(dev); |
1240 | if(fifo_size != 0x400 && fifo_size != 0x2000) | 1240 | if (fifo_size != 0x400 && fifo_size != 0x2000) |
1241 | { | 1241 | { |
1242 | rt_printk("\ncomedi: %s: unexpected fifo size of %i, expected 1024 or 8192.\n", | 1242 | rt_printk("\ncomedi: %s: unexpected fifo size of %i, expected 1024 or 8192.\n", |
1243 | DRV_NAME, fifo_size); | 1243 | DRV_NAME, fifo_size); |
diff --git a/drivers/staging/comedi/rt_pend_tq.c b/drivers/staging/comedi/rt_pend_tq.c index 5d2eead99f2..f6e083d553d 100644 --- a/drivers/staging/comedi/rt_pend_tq.c +++ b/drivers/staging/comedi/rt_pend_tq.c | |||
@@ -28,8 +28,8 @@ int rt_pend_tq_irq = 0; | |||
28 | DEFINE_SPINLOCK(rt_pend_tq_lock); | 28 | DEFINE_SPINLOCK(rt_pend_tq_lock); |
29 | 29 | ||
30 | /* WARNING: following code not checked against race conditions yet. */ | 30 | /* WARNING: following code not checked against race conditions yet. */ |
31 | #define INC_CIRCULAR_PTR(ptr, begin, size) do {if(++(ptr)>=(begin)+(size)) (ptr)=(begin); } while(0) | 31 | #define INC_CIRCULAR_PTR (ptr, begin, size) do {if (++ (ptr)>= (begin)+ (size)) (ptr)= (begin); } while (0) |
32 | #define DEC_CIRCULAR_PTR(ptr, begin, size) do {if(--(ptr)<(begin)) (ptr)=(begin)+(size)-1; } while(0) | 32 | #define DEC_CIRCULAR_PTR (ptr, begin, size) do {if (-- (ptr)< (begin)) (ptr)= (begin)+ (size)-1; } while (0) |
33 | 33 | ||
34 | int rt_pend_call(void (*func) (int arg1, void *arg2), int arg1, void *arg2) | 34 | int rt_pend_call(void (*func) (int arg1, void *arg2), int arg1, void *arg2) |
35 | { | 35 | { |