All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dmitry Torokhov <dtor_core@ameritech.net>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Vojtech Pavlik <vojtech@suse.cz>, Greg KH <gregkh@suse.de>
Subject: [RFC] Convert pcspkr into platform device
Date: Fri, 18 Nov 2005 23:47:48 -0500	[thread overview]
Message-ID: <200511182347.48652.dtor_core@ameritech.net> (raw)

Hi,

The patch below converts pcspkr driver into a platform device. This allows
input_dev it created to have a parent but that's pretty much it. I wonder
it is makes any sense to do it...

-- 
Dmitry

Input: pcspkr - convert into platform device

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---

 drivers/input/misc/pcspkr.c |   60 +++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 56 insertions(+), 4 deletions(-)

Index: work/drivers/input/misc/pcspkr.c
===================================================================
--- work.orig/drivers/input/misc/pcspkr.c
+++ work/drivers/input/misc/pcspkr.c
@@ -16,6 +16,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/input.h>
+#include <linux/platform_device.h>
 #include <asm/8253pit.h>
 #include <asm/io.h>
 
@@ -24,7 +25,7 @@ MODULE_DESCRIPTION("PC Speaker beeper dr
 MODULE_LICENSE("GPL");
 
 static struct input_dev *pcspkr_dev;
-
+static struct platform_device *pcspkr_platform_device;
 static DEFINE_SPINLOCK(i8253_beep_lock);
 
 static int pcspkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
@@ -64,11 +65,48 @@ static int pcspkr_event(struct input_dev
 	return 0;
 }
 
+static int pcspkr_suspend(struct platform_device *dev, pm_message_t state)
+{
+	pcspkr_event(NULL, EV_SND, SND_BELL, 0);
+
+	return 0;
+}
+
+static void pcspkr_shutdown(struct platform_device *dev)
+{
+	/* turn off the speaker */
+	pcspkr_event(NULL, EV_SND, SND_BELL, 0);
+}
+
+
+static struct platform_driver pcspkr_platform_driver = {
+	.driver		= {
+		.name	= "pcspkr",
+	},
+	.suspend	= pcspkr_suspend,
+	.shutdown	= pcspkr_shutdown,
+};
+
+
 static int __init pcspkr_init(void)
 {
+	int err;
+
+	err = platform_driver_register(&pcspkr_platform_driver);
+	if (err)
+		return err;
+
+	pcspkr_platform_device = platform_device_register_simple("pcspkr", -1, NULL, 0);
+	if (IS_ERR(pcspkr_platform_device)) {
+		err = PTR_ERR(pcspkr_platform_device);
+		goto err_unregister_driver;
+	}
+
 	pcspkr_dev = input_allocate_device();
-	if (!pcspkr_dev)
-		return -ENOMEM;
+	if (!pcspkr_dev) {
+		err = -ENOMEM;
+		goto err_unregister_device;
+	}
 
 	pcspkr_dev->name = "PC Speaker";
 	pcspkr_dev->phys = "isa0061/input0";
@@ -76,14 +114,26 @@ static int __init pcspkr_init(void)
 	pcspkr_dev->id.vendor = 0x001f;
 	pcspkr_dev->id.product = 0x0001;
 	pcspkr_dev->id.version = 0x0100;
+	pcspkr_dev->cdev.dev = &pcspkr_platform_device->dev;
 
 	pcspkr_dev->evbit[0] = BIT(EV_SND);
 	pcspkr_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
 	pcspkr_dev->event = pcspkr_event;
 
-	input_register_device(pcspkr_dev);
+	err = input_register_device(pcspkr_dev);
+	if (err)
+		goto err_free_input_device;
 
 	return 0;
+
+ err_free_input_device:
+	input_free_device(pcspkr_dev);
+ err_unregister_device:
+	platform_device_unregister(pcspkr_platform_device);
+ err_unregister_driver:
+	platform_driver_unregister(&pcspkr_platform_driver);
+
+	return err;
 }
 
 static void __exit pcspkr_exit(void)
@@ -91,6 +141,8 @@ static void __exit pcspkr_exit(void)
         input_unregister_device(pcspkr_dev);
 	/* turn off the speaker */
 	pcspkr_event(NULL, EV_SND, SND_BELL, 0);
+	platform_device_unregister(pcspkr_platform_device);
+	platform_driver_unregister(&pcspkr_platform_driver);
 }
 
 module_init(pcspkr_init);

             reply	other threads:[~2005-11-19  4:47 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-11-19  4:47 Dmitry Torokhov [this message]
2005-11-19  7:46 ` [RFC] Convert pcspkr into platform device Vojtech Pavlik

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=200511182347.48652.dtor_core@ameritech.net \
    --to=dtor_core@ameritech.net \
    --cc=gregkh@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=vojtech@suse.cz \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.