Commit d2cabc4a authored by Ralph Sennhauser's avatar Ralph Sennhauser Committed by Linus Walleij
Browse files

gpio: mvebu: use BIT macro instead of bit shifting 



Use the BIT macro instead of explicitly shifting bits for some added
clarity.

Signed-off-by: default avatarRalph Sennhauser <ralph.sennhauser@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent b8c90199

drivers/gpio/gpio-mvebu.c

+17 −16
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include <linux/clk.h>

#include <linux/pinctrl/consumer.h>

#include <linux/irqchip/chained_irq.h>

#include <linux/bitops.h>



/*

 * GPIO unit register offsets.
@@ -191,9 +192,9 @@ static void mvebu_gpio_set(struct gpio_chip *chip, unsigned int pin, int value) 
	spin_lock_irqsave(&mvchip->lock, flags);

	u = readl_relaxed(mvebu_gpioreg_out(mvchip));

	if (value)

		u |= 1 << pin;

		u |= BIT(pin);

	else

		u &= ~(1 << pin);

		u &= ~BIT(pin);

	writel_relaxed(u, mvebu_gpioreg_out(mvchip));

	spin_unlock_irqrestore(&mvchip->lock, flags);

}
@@ -203,7 +204,7 @@ static int mvebu_gpio_get(struct gpio_chip *chip, unsigned int pin) 
	struct mvebu_gpio_chip *mvchip = gpiochip_get_data(chip);

	u32 u;



	if (readl_relaxed(mvebu_gpioreg_io_conf(mvchip)) & (1 << pin)) {

	if (readl_relaxed(mvebu_gpioreg_io_conf(mvchip)) & BIT(pin)) {

		u = readl_relaxed(mvebu_gpioreg_data_in(mvchip)) ^

			readl_relaxed(mvebu_gpioreg_in_pol(mvchip));

	} else {
@@ -223,9 +224,9 @@ static void mvebu_gpio_blink(struct gpio_chip *chip, unsigned int pin, 
	spin_lock_irqsave(&mvchip->lock, flags);

	u = readl_relaxed(mvebu_gpioreg_blink(mvchip));

	if (value)

		u |= 1 << pin;

		u |= BIT(pin);

	else

		u &= ~(1 << pin);

		u &= ~BIT(pin);

	writel_relaxed(u, mvebu_gpioreg_blink(mvchip));

	spin_unlock_irqrestore(&mvchip->lock, flags);

}
@@ -247,7 +248,7 @@ static int mvebu_gpio_direction_input(struct gpio_chip *chip, unsigned int pin) 


	spin_lock_irqsave(&mvchip->lock, flags);

	u = readl_relaxed(mvebu_gpioreg_io_conf(mvchip));

	u |= 1 << pin;

	u |= BIT(pin);

	writel_relaxed(u, mvebu_gpioreg_io_conf(mvchip));

	spin_unlock_irqrestore(&mvchip->lock, flags);
@@ -275,7 +276,7 @@ static int mvebu_gpio_direction_output(struct gpio_chip *chip, unsigned int pin, 


	spin_lock_irqsave(&mvchip->lock, flags);

	u = readl_relaxed(mvebu_gpioreg_io_conf(mvchip));

	u &= ~(1 << pin);

	u &= ~BIT(pin);

	writel_relaxed(u, mvebu_gpioreg_io_conf(mvchip));

	spin_unlock_irqrestore(&mvchip->lock, flags);
@@ -392,7 +393,7 @@ static int mvebu_gpio_irq_set_type(struct irq_data *d, unsigned int type) 


	pin = d->hwirq;



	u = readl_relaxed(mvebu_gpioreg_io_conf(mvchip)) & (1 << pin);

	u = readl_relaxed(mvebu_gpioreg_io_conf(mvchip)) & BIT(pin);

	if (!u)

		return -EINVAL;
@@ -412,13 +413,13 @@ static int mvebu_gpio_irq_set_type(struct irq_data *d, unsigned int type) 
	case IRQ_TYPE_EDGE_RISING:

	case IRQ_TYPE_LEVEL_HIGH:

		u = readl_relaxed(mvebu_gpioreg_in_pol(mvchip));

		u &= ~(1 << pin);

		u &= ~BIT(pin);

		writel_relaxed(u, mvebu_gpioreg_in_pol(mvchip));

		break;

	case IRQ_TYPE_EDGE_FALLING:

	case IRQ_TYPE_LEVEL_LOW:

		u = readl_relaxed(mvebu_gpioreg_in_pol(mvchip));

		u |= 1 << pin;

		u |= BIT(pin);

		writel_relaxed(u, mvebu_gpioreg_in_pol(mvchip));

		break;

	case IRQ_TYPE_EDGE_BOTH: {
@@ -431,10 +432,10 @@ static int mvebu_gpio_irq_set_type(struct irq_data *d, unsigned int type) 
		 * set initial polarity based on current input level

		 */

		u = readl_relaxed(mvebu_gpioreg_in_pol(mvchip));

		if (v & (1 << pin))

			u |= 1 << pin;		/* falling */

		if (v & BIT(pin))

			u |= BIT(pin);		/* falling */

		else

			u &= ~(1 << pin);	/* rising */

			u &= ~BIT(pin);		/* rising */

		writel_relaxed(u, mvebu_gpioreg_in_pol(mvchip));

		break;

	}
@@ -464,7 +465,7 @@ static void mvebu_gpio_irq_handler(struct irq_desc *desc) 


		irq = irq_find_mapping(mvchip->domain, i);



		if (!(cause & (1 << i)))

		if (!(cause & BIT(i)))

			continue;



		type = irq_get_trigger_type(irq);
@@ -473,7 +474,7 @@ static void mvebu_gpio_irq_handler(struct irq_desc *desc) 
			u32 polarity;



			polarity = readl_relaxed(mvebu_gpioreg_in_pol(mvchip));

			polarity ^= 1 << i;

			polarity ^= BIT(i);

			writel_relaxed(polarity, mvebu_gpioreg_in_pol(mvchip));

		}
@@ -510,7 +511,7 @@ static void mvebu_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) 
		if (!label)

			continue;



		msk = 1 << i;

		msk = BIT(i);

		is_out = !(io_conf & msk);



		seq_printf(s, " gpio-%-3d (%-20.20s)", chip->base + i, label);