tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drivers: staging: vme: Fixed indention

Signed-off-by: Egor Uleyskiy <egor.ulieiskii@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Egor Uleyskiy and committed by
Greg Kroah-Hartman 24e394b0 7f608097

+21 -21
+1 -1
drivers/staging/vme/devices/vme_pio2_cntr.c
··· 61 61 /* Ensure all counter interrupts are cleared */ 62 62 do { 63 63 retval = vme_master_read(card->window, &reg, 1, 64 - PIO2_REGS_INT_STAT_CNTR); 64 + PIO2_REGS_INT_STAT_CNTR); 65 65 if (retval < 0) 66 66 return retval; 67 67 } while (reg != 0);
+8 -8
drivers/staging/vme/devices/vme_pio2_core.c
··· 90 90 case 4: 91 91 /* Channels 0 to 7 */ 92 92 retval = vme_master_read(card->window, &reg, 1, 93 - PIO2_REGS_INT_STAT[vec - 1]); 93 + PIO2_REGS_INT_STAT[vec - 1]); 94 94 if (retval < 0) { 95 95 dev_err(&card->vdev->dev, 96 96 "Unable to read IRQ status register\n"); ··· 100 100 channel = ((vec - 1) * 8) + i; 101 101 if (reg & PIO2_CHANNEL_BIT[channel]) 102 102 dev_info(&card->vdev->dev, 103 - "Interrupt on I/O channel %d\n", 104 - channel); 103 + "Interrupt on I/O channel %d\n", 104 + channel); 105 105 } 106 106 break; 107 107 case 5: ··· 289 289 } 290 290 291 291 retval = vme_master_set(card->window, 1, card->base, 0x10000, VME_A24, 292 - (VME_SCT | VME_USER | VME_DATA), VME_D16); 292 + (VME_SCT | VME_USER | VME_DATA), VME_D16); 293 293 if (retval) { 294 294 dev_err(&card->vdev->dev, 295 295 "Unable to configure VME master resource\n"); ··· 335 335 336 336 /* Set VME vector */ 337 337 retval = vme_master_write(card->window, &card->irq_vector, 1, 338 - PIO2_REGS_VME_VECTOR); 338 + PIO2_REGS_VME_VECTOR); 339 339 if (retval < 0) 340 340 return retval; 341 341 ··· 343 343 vec = card->irq_vector | PIO2_VME_VECTOR_SPUR; 344 344 345 345 retval = vme_irq_request(vdev, card->irq_level, vec, 346 - &pio2_int, (void *)card); 346 + &pio2_int, (void *)card); 347 347 if (retval < 0) { 348 348 dev_err(&card->vdev->dev, 349 349 "Unable to attach VME interrupt vector0x%x, level 0x%x\n", ··· 356 356 vec = card->irq_vector | PIO2_VECTOR_BANK[i]; 357 357 358 358 retval = vme_irq_request(vdev, card->irq_level, vec, 359 - &pio2_int, (void *)card); 359 + &pio2_int, (void *)card); 360 360 if (retval < 0) { 361 361 dev_err(&card->vdev->dev, 362 362 "Unable to attach VME interrupt vector0x%x, level 0x%x\n", ··· 397 397 dev_set_drvdata(&card->vdev->dev, card); 398 398 399 399 dev_info(&card->vdev->dev, 400 - "PIO2 (variant %s) configured at 0x%lx\n", card->variant, 400 + "PIO2 (variant %s) configured at 0x%lx\n", card->variant, 401 401 card->base); 402 402 403 403 return 0;
+12 -12
drivers/staging/vme/devices/vme_pio2_gpio.c
··· 37 37 struct pio2_card *card = gpio_to_pio2_card(chip); 38 38 39 39 if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == OUTPUT) | 40 - (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) { 40 + (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) { 41 41 42 42 dev_err(&card->vdev->dev, "Channel not available as input\n"); 43 43 return 0; 44 44 } 45 45 46 46 retval = vme_master_read(card->window, &reg, 1, 47 - PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]); 47 + PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]); 48 48 if (retval < 0) { 49 49 dev_err(&card->vdev->dev, "Unable to read from GPIO\n"); 50 50 return 0; ··· 67 67 return 0; 68 68 } 69 69 70 - static void pio2_gpio_set(struct gpio_chip *chip, unsigned int offset, 71 - int value) 70 + static void pio2_gpio_set(struct gpio_chip *chip, 71 + unsigned int offset, int value) 72 72 { 73 73 u8 reg; 74 74 int retval; 75 75 struct pio2_card *card = gpio_to_pio2_card(chip); 76 76 77 77 if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == INPUT) | 78 - (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) { 78 + (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) { 79 79 80 80 dev_err(&card->vdev->dev, "Channel not available as output\n"); 81 81 return; ··· 89 89 ~PIO2_CHANNEL_BIT[offset]; 90 90 91 91 retval = vme_master_write(card->window, &reg, 1, 92 - PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]); 92 + PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]); 93 93 if (retval < 0) { 94 94 dev_err(&card->vdev->dev, "Unable to write to GPIO\n"); 95 95 return; ··· 105 105 struct pio2_card *card = gpio_to_pio2_card(chip); 106 106 107 107 if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == OUTPUT) | 108 - (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) { 108 + (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) { 109 109 dev_err(&card->vdev->dev, 110 110 "Channel directionality not configurable at runtime\n"); 111 111 ··· 124 124 struct pio2_card *card = gpio_to_pio2_card(chip); 125 125 126 126 if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == INPUT) | 127 - (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) { 127 + (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) { 128 128 dev_err(&card->vdev->dev, 129 129 "Channel directionality not configurable at runtime\n"); 130 130 ··· 150 150 /* Zero output registers */ 151 151 for (i = 0; i < 4; i++) { 152 152 retval = vme_master_write(card->window, &data, 1, 153 - PIO2_REGS_DATA[i]); 153 + PIO2_REGS_DATA[i]); 154 154 if (retval < 0) 155 155 return retval; 156 156 card->bank[i].value = 0; ··· 159 159 /* Set input interrupt masks */ 160 160 for (i = 0; i < 4; i++) { 161 161 retval = vme_master_write(card->window, &data, 1, 162 - PIO2_REGS_INT_MASK[i * 2]); 162 + PIO2_REGS_INT_MASK[i * 2]); 163 163 if (retval < 0) 164 164 return retval; 165 165 166 166 retval = vme_master_write(card->window, &data, 1, 167 - PIO2_REGS_INT_MASK[(i * 2) + 1]); 167 + PIO2_REGS_INT_MASK[(i * 2) + 1]); 168 168 if (retval < 0) 169 169 return retval; 170 170 ··· 176 176 for (i = 0; i < 4; i++) { 177 177 do { 178 178 retval = vme_master_read(card->window, &data, 1, 179 - PIO2_REGS_INT_STAT[i]); 179 + PIO2_REGS_INT_STAT[i]); 180 180 if (retval < 0) 181 181 return retval; 182 182 } while (data != 0);