From: Ike Panhc <ike.pan@canonical.com>
To: linux-kernel@vger.kernel.org,
platform-driver-x86@vger.kernel.org, linux-acpi@vger.kernel.org
Cc: Matthew Garrett <mjg@redhat.com>,
David Woodhouse <dwmw2@infradead.org>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Dave Hansen <dave@linux.vnet.ibm.com>
Subject: [PATCH 5/7] ideapad: add markups, unify comments and return result when init
Date: Thu, 9 Dec 2010 15:57:30 +0800 [thread overview]
Message-ID: <1291881450-4875-1-git-send-email-ike.pan@canonical.com> (raw)
In-Reply-To: <1291881376-4729-1-git-send-email-ike.pan@canonical.com>
1. Add markups on init and exit functions
2. Unify the comments in the same style
3. Return result when module initial
Signed-off-by: Ike Panhc <ike.pan@canonical.com>
---
drivers/platform/x86/ideapad-laptop.c | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index fdb5fde..2c4830c 100644
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -1,5 +1,5 @@
/*
- * ideapad_acpi.c - Lenovo IdeaPad ACPI Extras
+ * ideapad-laptop.c - Lenovo IdeaPad ACPI Extras
*
* Copyright © 2010 Intel Corporation
* Copyright © 2010 David Woodhouse <dwmw2@infradead.org>
@@ -168,8 +168,10 @@ static int write_ec_cmd(acpi_handle handle, int cmd, unsigned long data)
pr_err("timeout in write_ec_cmd\n");
return -1;
}
-/* the above is ACPI helpers */
+/*
+ * camera power
+ */
static ssize_t show_ideapad_cam(struct device *dev,
struct device_attribute *attr,
char *buf)
@@ -203,6 +205,9 @@ static ssize_t store_ideapad_cam(struct device *dev,
static DEVICE_ATTR(camera_power, 0644, show_ideapad_cam, store_ideapad_cam);
+/*
+ * Rfkill
+ */
static int ideapad_rfk_set(void *data, bool blocked)
{
int device = (unsigned long)data;
@@ -235,7 +240,7 @@ static void ideapad_sync_rfk_state(struct acpi_device *adevice)
rfkill_set_hw_state(priv->rfk[i], hw_blocked);
}
-static int ideapad_register_rfkill(struct acpi_device *adevice, int dev)
+static int __devinit ideapad_register_rfkill(struct acpi_device *adevice, int dev)
{
struct ideapad_private *priv = dev_get_drvdata(&adevice->dev);
int ret;
@@ -271,7 +276,7 @@ static int ideapad_register_rfkill(struct acpi_device *adevice, int dev)
return 0;
}
-static void ideapad_unregister_rfkill(struct acpi_device *adevice, int dev)
+static void __devexit ideapad_unregister_rfkill(struct acpi_device *adevice, int dev)
{
struct ideapad_private *priv = dev_get_drvdata(&adevice->dev);
@@ -326,7 +331,6 @@ static void ideapad_platform_exit(void)
&ideapad_attribute_group);
platform_device_unregister(ideapad_priv->platform_device);
}
-/* the above is platform device */
/*
* input device
@@ -386,15 +390,17 @@ static void ideapad_input_report(unsigned long scancode)
{
sparse_keymap_report_event(ideapad_priv->inputdev, scancode, 1, true);
}
-/* the above is input device */
+/*
+ * module init/exit
+ */
static const struct acpi_device_id ideapad_device_ids[] = {
{ "VPC2004", 0},
{ "", 0},
};
MODULE_DEVICE_TABLE(acpi, ideapad_device_ids);
-static int ideapad_acpi_add(struct acpi_device *adevice)
+static int __devinit ideapad_acpi_add(struct acpi_device *adevice)
{
int ret, i, cfg;
struct ideapad_private *priv;
@@ -432,7 +438,7 @@ platform_failed:
return ret;
}
-static int ideapad_acpi_remove(struct acpi_device *adevice, int type)
+static int __devexit ideapad_acpi_remove(struct acpi_device *adevice, int type)
{
struct ideapad_private *priv = dev_get_drvdata(&adevice->dev);
int i;
@@ -478,19 +484,14 @@ static struct acpi_driver ideapad_acpi_driver = {
.owner = THIS_MODULE,
};
-
static int __init ideapad_acpi_module_init(void)
{
- acpi_bus_register_driver(&ideapad_acpi_driver);
-
- return 0;
+ return acpi_bus_register_driver(&ideapad_acpi_driver);
}
-
static void __exit ideapad_acpi_module_exit(void)
{
acpi_bus_unregister_driver(&ideapad_acpi_driver);
-
}
MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>");
--
1.7.1
next prev parent reply other threads:[~2010-12-09 7:57 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-09 7:56 [PATCH v2 0/7] ideapad: hotkey enablement Ike Panhc
2010-12-09 7:56 ` [PATCH 1/7] ideapad: add platform driver for ideapad Ike Panhc
2010-12-09 17:04 ` Dave Hansen
2010-12-09 7:56 ` [PATCH 2/7] ideapad: let camera power control entry under platform driver Ike Panhc
2010-12-09 7:57 ` [PATCH 3/7] ideapad: add hotkey support Ike Panhc
2010-12-09 7:57 ` [PATCH 4/7] ideapad: select INPUT_SPARSEKMAP Ike Panhc
2010-12-09 8:13 ` Dmitry Torokhov
2010-12-09 7:57 ` Ike Panhc [this message]
2010-12-09 7:57 ` [PATCH 6/7] ideapad: pass ideapad_priv as argument (part 1) Ike Panhc
2010-12-09 7:57 ` [PATCH 7/7] ideapad: pass ideapad_priv as argument (part 2) Ike Panhc
2010-12-09 8:39 ` [PATCH v2 0/7] ideapad: hotkey enablement Corentin Chary
2010-12-13 8:49 ` Ike Panhc
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=1291881450-4875-1-git-send-email-ike.pan@canonical.com \
--to=ike.pan@canonical.com \
--cc=dave@linux.vnet.ibm.com \
--cc=dmitry.torokhov@gmail.com \
--cc=dwmw2@infradead.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mjg@redhat.com \
--cc=platform-driver-x86@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