From: ralf@linux-mips.org
To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>, linux-input@vger.kernel.org
Subject: [patch 06/14] i8253: Make pcspkr input driver use the shared i8253_lock.
Date: Wed, 01 Jun 2011 19:05:02 +0100 [thread overview]
Message-ID: <20110601180610.453577265@duck.linux-mips.net> (raw)
Message-ID: <20110601180502.-ibZ3TR63jUeXD-KZSUi5Lx3ON0VNIHkVPnQHqg1jRk@z> (raw)
In-Reply-To: 20110601180456.801265664@duck.linux-mips.net
[-- Attachment #1: i8253-move-pcspkr.c-to-shared-lock.patch --]
[-- Type: text/plain, Size: 1091 bytes --]
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
To: linux-kernel@vger.kernel.org
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input@vger.kernel.org
drivers/input/misc/pcspkr.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
Index: linux-mips/drivers/input/misc/pcspkr.c
===================================================================
--- linux-mips.orig/drivers/input/misc/pcspkr.c
+++ linux-mips/drivers/input/misc/pcspkr.c
@@ -14,6 +14,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
+#include <linux/i8253.h>
#include <linux/init.h>
#include <linux/input.h>
#include <linux/platform_device.h>
@@ -25,14 +26,6 @@ MODULE_DESCRIPTION("PC Speaker beeper dr
MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:pcspkr");
-#if defined(CONFIG_MIPS) || defined(CONFIG_X86)
-/* Use the global PIT lock ! */
-#include <linux/i8253.h>
-#else
-#include <asm/8253pit.h>
-static DEFINE_RAW_SPINLOCK(i8253_lock);
-#endif
-
static int pcspkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
{
unsigned int count = 0;
next prev parent reply other threads:[~2011-06-01 19:47 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-01 18:04 [patch 00/14] Sort out i8253 and PC speaker locking and headers ralf
2011-06-01 18:04 ` ralf
2011-06-01 18:04 ` [patch 01/14] i8253: Create <linux/i8253.h> and make all in kernel users to use it ralf
2011-06-01 18:04 ` ralf
2011-06-01 18:04 ` [patch 02/14] i8253: Unify all kernel declarations of i8253_lock in <linux/i8253.h> ralf
2011-06-01 18:04 ` ralf
2011-06-01 18:04 ` [patch 03/14] i8253: Consolidate all kernel definitions of i8253_lock in lib/i8253-lock.c ralf
2011-06-01 18:05 ` [patch 04/14] i8253: Make MIPS use the shared i8253_lock ralf
2011-06-01 18:05 ` [patch 05/14] i8253: Make x86 " ralf
2011-06-01 18:05 ` ralf [this message]
2011-06-01 18:05 ` [patch 06/14] i8253: Make pcspkr input driver " ralf
2011-06-01 18:05 ` [patch 07/14] i8253: Make pcsp sound " ralf
2011-06-01 18:05 ` ralf
2011-06-03 9:53 ` Takashi Iwai
2011-06-03 9:53 ` [alsa-devel] " Takashi Iwai
2011-06-01 18:05 ` [patch 08/14] i8253: Alpha: Cleanup remaining users of i8253pit.h ralf
2011-06-01 18:05 ` ralf
2011-06-01 18:05 ` [patch 09/14] i8253: Alpha, PowerPC: Remove unused <asm/8253pit.h> header ralf
2011-06-01 18:05 ` ralf
2011-06-09 5:07 ` Benjamin Herrenschmidt
2011-06-09 5:07 ` Benjamin Herrenschmidt
2011-06-01 18:05 ` [patch 10/14] i8253: x86: Consolidate definitions of global_clock_event ralf
2011-06-01 18:05 ` ralf
2011-06-01 18:05 ` [patch 11/14] i8253: Consolidate definitions of PIT_LATCH ralf
2011-06-01 18:05 ` ralf
2011-06-01 18:05 ` [patch 12/14] i8253: Move remaining content and delete <asm/i8253.h> ralf
2011-06-01 18:05 ` ralf
2011-06-02 11:29 ` Sergei Shtylyov
2011-06-01 18:05 ` [patch 13/14] PCSPKR: Cleanup Kconfig dependencies ralf
2011-06-01 18:05 ` ralf
2011-06-09 5:09 ` Benjamin Herrenschmidt
2011-06-09 5:09 ` Benjamin Herrenschmidt
2011-06-01 18:05 ` [patch 14/14] PCSPKR: MIPS: Make config dependencies finer grained ralf
2011-06-01 18:05 ` ralf
2011-06-02 19:11 ` [patch 00/14] Sort out i8253 and PC speaker locking and headers Gerhard Pircher
2011-06-02 19:11 ` Gerhard Pircher
2011-06-03 18:00 ` Ralf Baechle
2011-06-03 18:00 ` Ralf Baechle
2011-06-03 19:22 ` Gerhard Pircher
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=20110601180610.453577265@duck.linux-mips.net \
--to=ralf@linux-mips.org \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-input@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).