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

Commit bd6aa650 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

[PATCH] irq-flags: UM: Use the new IRQF_ constants 



Use the new IRQF_ constants and remove the SA_INTERRUPT define

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 67413202

arch/um/drivers/line.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -373,7 +373,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data, 
	int err;

	int err;





	/* Interrupts are enabled here because we registered the interrupt with

	/* Interrupts are enabled here because we registered the interrupt with

	 * SA_INTERRUPT (see line_setup_irq).*/

	 * IRQF_DISABLED (see line_setup_irq).*/





	spin_lock_irq(&line->lock);

	spin_lock_irq(&line->lock);

	err = flush_buffer(line);

	err = flush_buffer(line);
@@ -406,7 +406,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data, 
int line_setup_irq(int fd, int input, int output, struct line *line, void *data)

int line_setup_irq(int fd, int input, int output, struct line *line, void *data)

{

{

	struct line_driver *driver = line->driver;

	struct line_driver *driver = line->driver;

	int err = 0, flags = SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM;

	int err = 0, flags = IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM;





	if (input)

	if (input)

		err = um_request_irq(driver->read_irq, fd, IRQ_READ,

		err = um_request_irq(driver->read_irq, fd, IRQ_READ,
@@ -767,7 +767,7 @@ void register_winch_irq(int fd, int tty_fd, int pid, struct tty_struct *tty) 
	spin_unlock(&winch_handler_lock);

	spin_unlock(&winch_handler_lock);





	if(um_request_irq(WINCH_IRQ, fd, IRQ_READ, winch_interrupt,

	if(um_request_irq(WINCH_IRQ, fd, IRQ_READ, winch_interrupt,

			  SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM,

			  IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,

			  "winch", winch) < 0)

			  "winch", winch) < 0)

		printk("register_winch_irq - failed to register IRQ\n");

		printk("register_winch_irq - failed to register IRQ\n");

}

}

arch/um/drivers/mconsole_kern.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -777,7 +777,7 @@ static int mconsole_init(void) 
	register_reboot_notifier(&reboot_notifier);

	register_reboot_notifier(&reboot_notifier);





	err = um_request_irq(MCONSOLE_IRQ, sock, IRQ_READ, mconsole_interrupt,

	err = um_request_irq(MCONSOLE_IRQ, sock, IRQ_READ, mconsole_interrupt,

			     SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM,

			     IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,

			     "mconsole", (void *)sock);

			     "mconsole", (void *)sock);

	if (err){

	if (err){

		printk("Failed to get IRQ for management console\n");

		printk("Failed to get IRQ for management console\n");

arch/um/drivers/net_kern.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -128,7 +128,7 @@ static int uml_net_open(struct net_device *dev) 
	}

	}





	err = um_request_irq(dev->irq, lp->fd, IRQ_READ, uml_net_interrupt,

	err = um_request_irq(dev->irq, lp->fd, IRQ_READ, uml_net_interrupt,

			     SA_INTERRUPT | SA_SHIRQ, dev->name, dev);

			     IRQF_DISABLED | IRQF_SHARED, dev->name, dev);

	if(err != 0){

	if(err != 0){

		printk(KERN_ERR "uml_net_open: failed to get irq(%d)\n", err);

		printk(KERN_ERR "uml_net_open: failed to get irq(%d)\n", err);

		err = -ENETUNREACH;

		err = -ENETUNREACH;

arch/um/drivers/port_kern.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -105,7 +105,7 @@ static int port_accept(struct port_list *port) 
		  .port 	= port });

		  .port 	= port });





	if(um_request_irq(TELNETD_IRQ, socket[0], IRQ_READ, pipe_interrupt, 

	if(um_request_irq(TELNETD_IRQ, socket[0], IRQ_READ, pipe_interrupt, 

			  SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM, 

			  IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,

			  "telnetd", conn)){

			  "telnetd", conn)){

		printk(KERN_ERR "port_accept : failed to get IRQ for "

		printk(KERN_ERR "port_accept : failed to get IRQ for "

		       "telnetd\n");

		       "telnetd\n");
@@ -186,7 +186,7 @@ void *port_data(int port_num) 
		goto out_free;

		goto out_free;

	}

	}

	if(um_request_irq(ACCEPT_IRQ, fd, IRQ_READ, port_interrupt, 

	if(um_request_irq(ACCEPT_IRQ, fd, IRQ_READ, port_interrupt, 

			  SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM, "port",

			  IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM, "port",

			  port)){

			  port)){

		printk(KERN_ERR "Failed to get IRQ for port %d\n", port_num);

		printk(KERN_ERR "Failed to get IRQ for port %d\n", port_num);

		goto out_close;

		goto out_close;

arch/um/drivers/ubd_kern.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -874,7 +874,7 @@ int ubd_driver_init(void){ 
		return(0);

		return(0);

	}

	}

	err = um_request_irq(UBD_IRQ, thread_fd, IRQ_READ, ubd_intr,

	err = um_request_irq(UBD_IRQ, thread_fd, IRQ_READ, ubd_intr,

			     SA_INTERRUPT, "ubd", ubd_dev);

			     IRQF_DISABLED, "ubd", ubd_dev);

	if(err != 0)

	if(err != 0)

		printk(KERN_ERR "um_request_irq failed - errno = %d\n", -err);

		printk(KERN_ERR "um_request_irq failed - errno = %d\n", -err);

	return 0;

	return 0;