Skip to content

Commit

Permalink
GPIO: xilinx: Use BIT macro
Browse files Browse the repository at this point in the history
Use BIT macro from linux/bitops.h.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Michal Simek authored and Linus Walleij committed Jun 17, 2013
1 parent cc090d6 commit 9f7f0b2
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/gpio/gpio-xilinx.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ static void xgpio_set(struct gpio_chip *gc, unsigned int gpio, int val)

/* Write to GPIO signal and set its direction to output */
if (val)
chip->gpio_state |= 1 << gpio;
chip->gpio_state |= BIT(gpio);
else
chip->gpio_state &= ~(1 << gpio);
chip->gpio_state &= ~BIT(gpio);

xgpio_writereg(regs + chip->offset + XGPIO_DATA_OFFSET,
chip->gpio_state);
Expand Down Expand Up @@ -124,7 +124,7 @@ static int xgpio_dir_in(struct gpio_chip *gc, unsigned int gpio)
spin_lock_irqsave(&chip->gpio_lock, flags);

/* Set the GPIO bit in shadow register and set direction as input */
chip->gpio_dir |= (1 << gpio);
chip->gpio_dir |= BIT(gpio);
xgpio_writereg(regs + chip->offset + XGPIO_TRI_OFFSET, chip->gpio_dir);

spin_unlock_irqrestore(&chip->gpio_lock, flags);
Expand Down Expand Up @@ -154,14 +154,14 @@ static int xgpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)

/* Write state of GPIO signal */
if (val)
chip->gpio_state |= 1 << gpio;
chip->gpio_state |= BIT(gpio);
else
chip->gpio_state &= ~(1 << gpio);
chip->gpio_state &= ~BIT(gpio);
xgpio_writereg(regs + chip->offset + XGPIO_DATA_OFFSET,
chip->gpio_state);

/* Clear the GPIO bit in shadow register and set direction as output */
chip->gpio_dir &= (~(1 << gpio));
chip->gpio_dir &= ~BIT(gpio);
xgpio_writereg(regs + chip->offset + XGPIO_TRI_OFFSET, chip->gpio_dir);

spin_unlock_irqrestore(&chip->gpio_lock, flags);
Expand Down

0 comments on commit 9f7f0b2

Please sign in to comment.