Commit 6782ea9a authored by Michael Hennerich's avatar Michael Hennerich Committed by Bryan Wu
Browse files

Blackfin arch: Add label to call new GPIO API 



Signed-off-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarBryan Wu <bryan.wu@analog.com>
parent 40d63406

arch/blackfin/mach-common/ints-priority-dc.c

+2 −2
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static unsigned int bf561_gpio_irq_startup(unsigned int irq) 


	if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {



		ret = gpio_request(gpionr, NULL);

		ret = gpio_request(gpionr, "IRQ");

		if (ret)

			return ret;
@@ -261,7 +261,7 @@ static int bf561_gpio_irq_type(unsigned int irq, unsigned int type) 


		if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {



			ret = gpio_request(gpionr, NULL);

			ret = gpio_request(gpionr, "IRQ");

			if (ret)

				return ret;

arch/blackfin/mach-common/ints-priority-sc.c

+4 −4
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static unsigned int bfin_gpio_irq_startup(unsigned int irq) 
	u16 gpionr = irq - IRQ_PF0;



	if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {

		ret = gpio_request(gpionr, NULL);

		ret = gpio_request(gpionr, "IRQ");

		if (ret)

			return ret;

	}
@@ -377,7 +377,7 @@ static int bfin_gpio_irq_type(unsigned int irq, unsigned int type) 
	if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING |

		    IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)) {

		if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {

			ret = gpio_request(gpionr, NULL);

			ret = gpio_request(gpionr, "IRQ");

			if (ret)

				return ret;

		}
@@ -587,7 +587,7 @@ static unsigned int bfin_gpio_irq_startup(unsigned int irq) 
	}



	if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {

		ret = gpio_request(gpionr, NULL);

		ret = gpio_request(gpionr, "IRQ");

		if (ret)

			return ret;

	}
@@ -627,7 +627,7 @@ static int bfin_gpio_irq_type(unsigned int irq, unsigned int type) 
	if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING |

		    IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)) {

		if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {

			ret = gpio_request(gpionr, NULL);

			ret = gpio_request(gpionr, "IRQ");

			if (ret)

				return ret;

		}