drivers: staging: vme: Fixed indention
authorEgor Uleyskiy <egor.ulieiskii@gmail.com>
Sun, 22 Nov 2015 09:27:52 +0000 (11:27 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Nov 2015 23:30:50 +0000 (15:30 -0800)
Signed-off-by: Egor Uleyskiy <egor.ulieiskii@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vme/devices/vme_pio2_cntr.c
drivers/staging/vme/devices/vme_pio2_core.c
drivers/staging/vme/devices/vme_pio2_gpio.c

index 6335471faa3687f4adba5a3fd6f67ed079172f66..486c30c4956f8e7a52bb9afb336284ab5ffc1920 100644 (file)
@@ -61,7 +61,7 @@ int pio2_cntr_reset(struct pio2_card *card)
        /* Ensure all counter interrupts are cleared */
        do {
                retval = vme_master_read(card->window, &reg, 1,
-                       PIO2_REGS_INT_STAT_CNTR);
+                                        PIO2_REGS_INT_STAT_CNTR);
                if (retval < 0)
                        return retval;
        } while (reg != 0);
index 35c6ce5047de752bae7086ba92aaf8d8abdbb089..f3b878b441ee78a6c822027bda99603912e9941f 100644 (file)
@@ -90,7 +90,7 @@ static void pio2_int(int level, int vector, void *ptr)
        case 4:
                /* Channels 0 to 7 */
                retval = vme_master_read(card->window, &reg, 1,
-                       PIO2_REGS_INT_STAT[vec - 1]);
+                                        PIO2_REGS_INT_STAT[vec - 1]);
                if (retval < 0) {
                        dev_err(&card->vdev->dev,
                                "Unable to read IRQ status register\n");
@@ -100,8 +100,8 @@ static void pio2_int(int level, int vector, void *ptr)
                        channel = ((vec - 1) * 8) + i;
                        if (reg & PIO2_CHANNEL_BIT[channel])
                                dev_info(&card->vdev->dev,
-                                       "Interrupt on I/O channel %d\n",
-                                       channel);
+                                        "Interrupt on I/O channel %d\n",
+                                        channel);
                }
                break;
        case 5:
@@ -289,7 +289,7 @@ static int pio2_probe(struct vme_dev *vdev)
        }
 
        retval = vme_master_set(card->window, 1, card->base, 0x10000, VME_A24,
-               (VME_SCT | VME_USER | VME_DATA), VME_D16);
+                               (VME_SCT | VME_USER | VME_DATA), VME_D16);
        if (retval) {
                dev_err(&card->vdev->dev,
                        "Unable to configure VME master resource\n");
@@ -335,7 +335,7 @@ static int pio2_probe(struct vme_dev *vdev)
 
        /* Set VME vector */
        retval = vme_master_write(card->window, &card->irq_vector, 1,
-               PIO2_REGS_VME_VECTOR);
+                                 PIO2_REGS_VME_VECTOR);
        if (retval < 0)
                return retval;
 
@@ -343,7 +343,7 @@ static int pio2_probe(struct vme_dev *vdev)
        vec = card->irq_vector | PIO2_VME_VECTOR_SPUR;
 
        retval = vme_irq_request(vdev, card->irq_level, vec,
-               &pio2_int, (void *)card);
+                                &pio2_int, (void *)card);
        if (retval < 0) {
                dev_err(&card->vdev->dev,
                        "Unable to attach VME interrupt vector0x%x, level 0x%x\n",
@@ -356,7 +356,7 @@ static int pio2_probe(struct vme_dev *vdev)
                vec = card->irq_vector | PIO2_VECTOR_BANK[i];
 
                retval = vme_irq_request(vdev, card->irq_level, vec,
-                       &pio2_int, (void *)card);
+                                        &pio2_int, (void *)card);
                if (retval < 0) {
                        dev_err(&card->vdev->dev,
                                "Unable to attach VME interrupt vector0x%x, level 0x%x\n",
@@ -397,7 +397,7 @@ static int pio2_probe(struct vme_dev *vdev)
        dev_set_drvdata(&card->vdev->dev, card);
 
        dev_info(&card->vdev->dev,
-               "PIO2 (variant %s) configured at 0x%lx\n", card->variant,
+                "PIO2 (variant %s) configured at 0x%lx\n", card->variant,
                card->base);
 
        return 0;
index 77901b345a716f7c3c0d7dc0347d910fba810ae0..0b72dac16d56cadda7f6eaf0a5029977c8e608a5 100644 (file)
@@ -37,14 +37,14 @@ static int pio2_gpio_get(struct gpio_chip *chip, unsigned int offset)
        struct pio2_card *card = gpio_to_pio2_card(chip);
 
        if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == OUTPUT) |
-               (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
+           (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
 
                dev_err(&card->vdev->dev, "Channel not available as input\n");
                return 0;
        }
 
        retval = vme_master_read(card->window, &reg, 1,
-               PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
+                                PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
        if (retval < 0) {
                dev_err(&card->vdev->dev, "Unable to read from GPIO\n");
                return 0;
@@ -67,15 +67,15 @@ static int pio2_gpio_get(struct gpio_chip *chip, unsigned int offset)
        return 0;
 }
 
-static void pio2_gpio_set(struct gpio_chip *chip, unsigned int offset,
-       int value)
+static void pio2_gpio_set(struct gpio_chip *chip,
+                         unsigned int offset, int value)
 {
        u8 reg;
        int retval;
        struct pio2_card *card = gpio_to_pio2_card(chip);
 
        if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == INPUT) |
-               (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
+           (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
 
                dev_err(&card->vdev->dev, "Channel not available as output\n");
                return;
@@ -89,7 +89,7 @@ static void pio2_gpio_set(struct gpio_chip *chip, unsigned int offset,
                        ~PIO2_CHANNEL_BIT[offset];
 
        retval = vme_master_write(card->window, &reg, 1,
-               PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
+                                 PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
        if (retval < 0) {
                dev_err(&card->vdev->dev, "Unable to write to GPIO\n");
                return;
@@ -105,7 +105,7 @@ static int pio2_gpio_dir_in(struct gpio_chip *chip, unsigned offset)
        struct pio2_card *card = gpio_to_pio2_card(chip);
 
        if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == OUTPUT) |
-               (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
+           (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
                dev_err(&card->vdev->dev,
                        "Channel directionality not configurable at runtime\n");
 
@@ -124,7 +124,7 @@ static int pio2_gpio_dir_out(struct gpio_chip *chip, unsigned offset, int value)
        struct pio2_card *card = gpio_to_pio2_card(chip);
 
        if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == INPUT) |
-               (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
+           (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
                dev_err(&card->vdev->dev,
                        "Channel directionality not configurable at runtime\n");
 
@@ -150,7 +150,7 @@ int pio2_gpio_reset(struct pio2_card *card)
        /* Zero output registers */
        for (i = 0; i < 4; i++) {
                retval = vme_master_write(card->window, &data, 1,
-                       PIO2_REGS_DATA[i]);
+                                         PIO2_REGS_DATA[i]);
                if (retval < 0)
                        return retval;
                card->bank[i].value = 0;
@@ -159,12 +159,12 @@ int pio2_gpio_reset(struct pio2_card *card)
        /* Set input interrupt masks */
        for (i = 0; i < 4; i++) {
                retval = vme_master_write(card->window, &data, 1,
-                       PIO2_REGS_INT_MASK[i * 2]);
+                                         PIO2_REGS_INT_MASK[i * 2]);
                if (retval < 0)
                        return retval;
 
                retval = vme_master_write(card->window, &data, 1,
-                       PIO2_REGS_INT_MASK[(i * 2) + 1]);
+                                         PIO2_REGS_INT_MASK[(i * 2) + 1]);
                if (retval < 0)
                        return retval;
 
@@ -176,7 +176,7 @@ int pio2_gpio_reset(struct pio2_card *card)
        for (i = 0; i < 4; i++) {
                do {
                        retval = vme_master_read(card->window, &data, 1,
-                               PIO2_REGS_INT_STAT[i]);
+                                                PIO2_REGS_INT_STAT[i]);
                        if (retval < 0)
                                return retval;
                } while (data != 0);