mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: James Nelson <james4765@cwazy.co.uk>
To: linux-kernel@vger.kernel.org
Cc: akpm@osdl.org, kraxel@bytesex.org, James Nelson <james4765@cwazy.co.uk>
Subject: [PATCH] vino: Remove cli()/sti() in drivers/media/video/vino.c
Date: Wed, 12 Jan 2005 15:27:58 -0600	[thread overview]
Message-ID: <20050112212818.12453.70029.28827@localhost.localdomain> (raw)

I know this driver isn't working, but cleanup is cleanup :)

Signed-off-by: James Nelson <james4765@gmail.com>

diff -urN --exclude='*~' linux-2.6.10-mm2-original/drivers/media/video/vino.c linux-2.6.10-mm2/drivers/media/video/vino.c
--- linux-2.6.10-mm2-original/drivers/media/video/vino.c	2005-01-08 12:16:37.000000000 -0500
+++ linux-2.6.10-mm2/drivers/media/video/vino.c	2005-01-12 16:14:54.940750449 -0500
@@ -48,7 +48,7 @@
 	unsigned long virt_addr = KSEG1ADDR(addr + VINO_BASE);
 	unsigned long flags;
 
-	save_and_cli(flags);
+	local_irq_save(flags);
 	__asm__ __volatile__(
 		".set\tmips3\n\t"
 		".set\tnoat\n\t"
@@ -60,7 +60,7 @@
 		:"r" (virt_addr),
 		 "r" (&ret)
 		:"$1");
-	restore_flags(flags);
+	local_irq_restore(flags);
 
 	return ret;
 }
@@ -74,7 +74,7 @@
 	/* we might lose the upper parts of the registers which are not saved
 	 * if there comes an interrupt in our way, play safe */
 
-	save_and_cli(flags);
+	local_irq_save(flags);
 	__asm__ __volatile__(
 		".set\tmips3\n\t"
 		".set\tnoat\n\t"
@@ -86,7 +86,7 @@
 		:"r" (&value),
 		 "r" (virt_addr)
 		:"$1");
-	restore_flags(flags);
+	local_irq_restore(flags);
 }
 
 static __inline__ void vino_reg_and(unsigned long long value,
@@ -95,7 +95,7 @@
 	unsigned long virt_addr = KSEG1ADDR(addr + VINO_BASE);
 	unsigned long flags;
 
-	save_and_cli(flags);
+	local_irq_save(flags);
 	__asm__ __volatile__(
 		".set\tmips3\n\t"
 		".set\tnoat\n\t"
@@ -109,7 +109,7 @@
 		:"r" (virt_addr),
 		 "r" (&value)
 		:"$1","$2");
-	restore_flags(flags);
+	local_irq_restore(flags);
 }
 
 static __inline__ void vino_reg_or(unsigned long long value,
@@ -118,7 +118,7 @@
 	unsigned long virt_addr = KSEG1ADDR(addr + VINO_BASE);
 	unsigned long flags;
 
-	save_and_cli(flags);
+	local_irq_save(flags);
 	__asm__ __volatile__(
 		".set\tmips3\n\t"
 		".set\tnoat\n\t"
@@ -132,7 +132,7 @@
 		:"r" (virt_addr),
 		 "r" (&value)
 		:"$1","$2");
-	restore_flags(flags);
+	local_irq_restore(flags);
 }
 
 static int vino_dma_setup(void)

                 reply	other threads:[~2005-01-12 21:29 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20050112212818.12453.70029.28827@localhost.localdomain \
    --to=james4765@cwazy.co.uk \
    --cc=akpm@osdl.org \
    --cc=kraxel@bytesex.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®