Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8098a7ef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://repo.or.cz/cris-mirror 

* 'for-linus' of git://repo.or.cz/cris-mirror:
  cris: Fixup last users of irq_chip->typename
  CRIS v32: Should index be positive?
parents 4805a1b0 d8fe989e

arch/cris/arch-v10/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static void end_crisv10_irq(unsigned int irq) 
}



static struct irq_chip crisv10_irq_type = {

	.typename =    "CRISv10",

	.name =        "CRISv10",

	.startup =     startup_crisv10_irq,

	.shutdown =    shutdown_crisv10_irq,

	.enable =      enable_crisv10_irq,

arch/cris/arch-v32/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ int set_affinity_crisv32_irq(unsigned int irq, const struct cpumask *dest) 
}



static struct irq_chip crisv32_irq_type = {

	.typename =    "CRISv32",

	.name =        "CRISv32",

	.startup =     startup_crisv32_irq,

	.shutdown =    shutdown_crisv32_irq,

	.enable =      enable_crisv32_irq,

arch/cris/arch-v32/kernel/pinmux.c

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ crisv32_pinmux_alloc(int port, int first_pin, int last_pin, enum pin_mode mode) 


	crisv32_pinmux_init();



	if (port > PORTS)

	if (port > PORTS || port < 0)

		return -EINVAL;



	spin_lock_irqsave(&pinmux_lock, flags);
@@ -197,7 +197,7 @@ crisv32_pinmux_dealloc(int port, int first_pin, int last_pin) 


	crisv32_pinmux_init();



	if (port > PORTS)

	if (port > PORTS || port < 0)

		return -EINVAL;



	spin_lock_irqsave(&pinmux_lock, flags);

arch/cris/arch-v32/mach-a3/pinmux.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ crisv32_pinmux_dealloc(int port, int first_pin, int last_pin) 


	crisv32_pinmux_init();



	if (port > PORTS)

	if (port > PORTS || port < 0)

		return -EINVAL;



	spin_lock_irqsave(&pinmux_lock, flags);

arch/cris/arch-v32/mach-fs/pinmux.c

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ crisv32_pinmux_alloc(int port, int first_pin, int last_pin, enum pin_mode mode) 


	crisv32_pinmux_init();



	if (port > PORTS)

	if (port > PORTS || port < 0)

		return -EINVAL;



	spin_lock_irqsave(&pinmux_lock, flags);
@@ -195,7 +195,7 @@ int crisv32_pinmux_dealloc(int port, int first_pin, int last_pin) 


	crisv32_pinmux_init();



	if (port > PORTS)

	if (port > PORTS || port < 0)

		return -EINVAL;



	spin_lock_irqsave(&pinmux_lock, flags);