korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-14 15:54:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

gpio: pl061: use BIT() macro instead of shifting bits

Browse Source 
Using the BIT() macro instead of shifting bits
makes the code less error prone and also more readable.

Signed-off-by: Javier Martinez Canillas <javier@dowhile0.org>
Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Javier Martinez Canillas 2014-04-27 02:00:50 +02:00 committed by Linus Walleij
parent b1e9fec2b8
commit bea415041c
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/gpio/gpio-pl061.c
View File

@ -87,7 +87,7 @@ static int pl061_direction_input(struct gpio_chip *gc, unsigned offset)
spin_lock_irqsave(&chip->lock, flags); spin_lock_irqsave(&chip->lock, flags);
gpiodir = readb(chip->base + GPIODIR); gpiodir = readb(chip->base + GPIODIR);
gpiodir &= ~(1 << offset); gpiodir &= ~(BIT(offset));
writeb(gpiodir, chip->base + GPIODIR); writeb(gpiodir, chip->base + GPIODIR);
spin_unlock_irqrestore(&chip->lock, flags); spin_unlock_irqrestore(&chip->lock, flags);
@ -105,16 +105,16 @@ static int pl061_direction_output(struct gpio_chip *gc, unsigned offset,
return -EINVAL; return -EINVAL;
spin_lock_irqsave(&chip->lock, flags); spin_lock_irqsave(&chip->lock, flags);
writeb(!!value << offset, chip->base + (1 << (offset + 2))); writeb(!!value << offset, chip->base + (BIT(offset + 2)));
gpiodir = readb(chip->base + GPIODIR); gpiodir = readb(chip->base + GPIODIR);
gpiodir |= 1 << offset; gpiodir |= BIT(offset);
writeb(gpiodir, chip->base + GPIODIR); writeb(gpiodir, chip->base + GPIODIR);
/* /*
* gpio value is set again, because pl061 doesn't allow to set value of * gpio value is set again, because pl061 doesn't allow to set value of
* a gpio pin before configuring it in OUT mode. * a gpio pin before configuring it in OUT mode.
*/ */
writeb(!!value << offset, chip->base + (1 << (offset + 2))); writeb(!!value << offset, chip->base + (BIT(offset + 2)));
spin_unlock_irqrestore(&chip->lock, flags); spin_unlock_irqrestore(&chip->lock, flags);
return 0; return 0;
@ -124,14 +124,14 @@ static int pl061_get_value(struct gpio_chip *gc, unsigned offset)
{ {
struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc); struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc);
return !!readb(chip->base + (1 << (offset + 2))); return !!readb(chip->base + (BIT(offset + 2)));
} }
static void pl061_set_value(struct gpio_chip *gc, unsigned offset, int value) static void pl061_set_value(struct gpio_chip *gc, unsigned offset, int value)
{ {
struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc); struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc);
writeb(!!value << offset, chip->base + (1 << (offset + 2))); writeb(!!value << offset, chip->base + (BIT(offset + 2)));
} }
static int pl061_irq_type(struct irq_data *d, unsigned trigger) static int pl061_irq_type(struct irq_data *d, unsigned trigger)
@ -206,7 +206,7 @@ static void pl061_irq_mask(struct irq_data *d)
{ {
struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc); struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc);
u8 mask = 1 << (irqd_to_hwirq(d) % PL061_GPIO_NR); u8 mask = BIT(irqd_to_hwirq(d) % PL061_GPIO_NR);
u8 gpioie; u8 gpioie;
spin_lock(&chip->lock); spin_lock(&chip->lock);
@ -219,7 +219,7 @@ static void pl061_irq_unmask(struct irq_data *d)
{ {
struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc); struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc);
u8 mask = 1 << (irqd_to_hwirq(d) % PL061_GPIO_NR); u8 mask = BIT(irqd_to_hwirq(d) % PL061_GPIO_NR);
u8 gpioie; u8 gpioie;
spin_lock(&chip->lock); spin_lock(&chip->lock);
@ -301,9 +301,9 @@ static int pl061_probe(struct amba_device *adev, const struct amba_id *id)
for (i = 0; i < PL061_GPIO_NR; i++) { for (i = 0; i < PL061_GPIO_NR; i++) {
if (pdata) { if (pdata) {
if (pdata->directions & (1 << i)) if (pdata->directions & (BIT(i)))
pl061_direction_output(&chip->gc, i, pl061_direction_output(&chip->gc, i,
pdata->values & (1 << i)); pdata->values & (BIT(i)));
else else
pl061_direction_input(&chip->gc, i); pl061_direction_input(&chip->gc, i);
} }
@ -330,7 +330,7 @@ static int pl061_suspend(struct device *dev)
chip->csave_regs.gpio_ie = readb(chip->base + GPIOIE); chip->csave_regs.gpio_ie = readb(chip->base + GPIOIE);
for (offset = 0; offset < PL061_GPIO_NR; offset++) { for (offset = 0; offset < PL061_GPIO_NR; offset++) {
if (chip->csave_regs.gpio_dir & (1 << offset)) if (chip->csave_regs.gpio_dir & (BIT(offset)))
chip->csave_regs.gpio_data |= chip->csave_regs.gpio_data |=
pl061_get_value(&chip->gc, offset) << offset; pl061_get_value(&chip->gc, offset) << offset;
} }
@ -344,10 +344,10 @@ static int pl061_resume(struct device *dev)
int offset; int offset;
for (offset = 0; offset < PL061_GPIO_NR; offset++) { for (offset = 0; offset < PL061_GPIO_NR; offset++) {
if (chip->csave_regs.gpio_dir & (1 << offset)) if (chip->csave_regs.gpio_dir & (BIT(offset)))
pl061_direction_output(&chip->gc, offset, pl061_direction_output(&chip->gc, offset,
chip->csave_regs.gpio_data & chip->csave_regs.gpio_data &
(1 << offset)); (BIT(offset)));
else else
pl061_direction_input(&chip->gc, offset); pl061_direction_input(&chip->gc, offset);
} }