From patchwork Wed Jun 1 18:05:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Baechle X-Patchwork-Id: 841792 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p51JqO9h001591 for ; Wed, 1 Jun 2011 19:52:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759888Ab1FATvt (ORCPT ); Wed, 1 Jun 2011 15:51:49 -0400 Received: from h5.dl5rb.org.uk ([81.2.74.5]:59103 "EHLO duck.linux-mips.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1759613Ab1FATra (ORCPT ); Wed, 1 Jun 2011 15:47:30 -0400 Received: from duck.linux-mips.net (duck.linux-mips.net [127.0.0.1]) by duck.linux-mips.net (8.14.4/8.14.3) with ESMTP id p51JlXQF010134; Wed, 1 Jun 2011 20:47:33 +0100 Received: (from ralf@localhost) by duck.linux-mips.net (8.14.4/8.14.4/Submit) id p51JlWlN010133; Wed, 1 Jun 2011 20:47:32 +0100 Message-Id: <20110601180610.453577265@duck.linux-mips.net> User-Agent: quilt/0.48-1 Date: Wed, 01 Jun 2011 19:05:02 +0100 From: ralf@linux-mips.org To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Cc: Dmitry Torokhov , linux-input@vger.kernel.org Subject: [patch 06/14] i8253: Make pcspkr input driver use the shared i8253_lock. References: <20110601180456.801265664@duck.linux-mips.net> Content-Disposition: inline; filename=i8253-move-pcspkr.c-to-shared-lock.patch Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Wed, 01 Jun 2011 19:52:24 +0000 (UTC) Signed-off-by: Ralf Baechle To: linux-kernel@vger.kernel.org Cc: Dmitry Torokhov Cc: linux-input@vger.kernel.org drivers/input/misc/pcspkr.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) --- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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 #include +#include #include #include #include @@ -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 -#else -#include -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;