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>,
Corentin Chary <corentin.chary@gmail.com>
Subject: [PATCH 5/6] ideapad: pass ideapad_priv as argument (part 1)
Date: Mon, 13 Dec 2010 18:01:01 +0800 [thread overview]
Message-ID: <1292234461-2744-1-git-send-email-ike.pan@canonical.com> (raw)
In-Reply-To: <1292234384-2599-1-git-send-email-ike.pan@canonical.com>
Passing ideapad_priv as argument and try not to using too much global variable.
This is part 1 for platform driver and input device.
Signed-off-by: Ike Panhc <ike.pan@canonical.com>
---
drivers/platform/x86/ideapad-laptop.c | 54 +++++++++++++++++----------------
1 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index 3c6c5b5..37fe0d0 100644
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -301,37 +301,37 @@ static struct attribute_group ideapad_attribute_group = {
.attrs = ideapad_attributes
};
-static int __devinit ideapad_platform_init(void)
+static int __devinit ideapad_platform_init(struct ideapad_private *priv)
{
int result;
- ideapad_priv->platform_device = platform_device_alloc("ideapad", -1);
- if (!ideapad_priv->platform_device)
+ priv->platform_device = platform_device_alloc("ideapad", -1);
+ if (!priv->platform_device)
return -ENOMEM;
- platform_set_drvdata(ideapad_priv->platform_device, ideapad_priv);
+ platform_set_drvdata(priv->platform_device, priv);
- result = platform_device_add(ideapad_priv->platform_device);
+ result = platform_device_add(priv->platform_device);
if (result)
goto fail_platform_device;
- result = sysfs_create_group(&ideapad_priv->platform_device->dev.kobj,
+ result = sysfs_create_group(&priv->platform_device->dev.kobj,
&ideapad_attribute_group);
if (result)
goto fail_sysfs;
return 0;
fail_sysfs:
- platform_device_del(ideapad_priv->platform_device);
+ platform_device_del(priv->platform_device);
fail_platform_device:
- platform_device_put(ideapad_priv->platform_device);
+ platform_device_put(priv->platform_device);
return result;
}
-static void ideapad_platform_exit(void)
+static void ideapad_platform_exit(struct ideapad_private *priv)
{
- sysfs_remove_group(&ideapad_priv->platform_device->dev.kobj,
+ sysfs_remove_group(&priv->platform_device->dev.kobj,
&ideapad_attribute_group);
- platform_device_unregister(ideapad_priv->platform_device);
+ platform_device_unregister(priv->platform_device);
}
/*
@@ -343,7 +343,7 @@ static const struct key_entry ideapad_keymap[] = {
{ KE_END, 0 },
};
-static int __devinit ideapad_input_init(void)
+static int __devinit ideapad_input_init(struct ideapad_private *priv)
{
struct input_dev *inputdev;
int error;
@@ -357,7 +357,7 @@ static int __devinit ideapad_input_init(void)
inputdev->name = "Ideapad extra buttons";
inputdev->phys = "ideapad/input0";
inputdev->id.bustype = BUS_HOST;
- inputdev->dev.parent = &ideapad_priv->platform_device->dev;
+ inputdev->dev.parent = &priv->platform_device->dev;
error = sparse_keymap_setup(inputdev, ideapad_keymap, NULL);
if (error) {
@@ -371,7 +371,7 @@ static int __devinit ideapad_input_init(void)
goto err_free_keymap;
}
- ideapad_priv->inputdev = inputdev;
+ priv->inputdev = inputdev;
return 0;
err_free_keymap:
@@ -381,16 +381,17 @@ err_free_dev:
return error;
}
-static void __devexit ideapad_input_exit(void)
+static void __devexit ideapad_input_exit(struct ideapad_private *priv)
{
- sparse_keymap_free(ideapad_priv->inputdev);
- input_unregister_device(ideapad_priv->inputdev);
- ideapad_priv->inputdev = NULL;
+ sparse_keymap_free(priv->inputdev);
+ input_unregister_device(priv->inputdev);
+ priv->inputdev = NULL;
}
-static void ideapad_input_report(unsigned long scancode)
+static void ideapad_input_report(struct ideapad_private *priv,
+ unsigned long scancode)
{
- sparse_keymap_report_event(ideapad_priv->inputdev, scancode, 1, true);
+ sparse_keymap_report_event(priv->inputdev, scancode, 1, true);
}
/*
@@ -417,11 +418,11 @@ static int __devinit ideapad_acpi_add(struct acpi_device *adevice)
priv->handle = adevice->handle;
dev_set_drvdata(&adevice->dev, priv);
- ret = ideapad_platform_init();
+ ret = ideapad_platform_init(priv);
if (ret)
goto platform_failed;
- ret = ideapad_input_init();
+ ret = ideapad_input_init(priv);
if (ret)
goto input_failed;
@@ -434,7 +435,7 @@ static int __devinit ideapad_acpi_add(struct acpi_device *adevice)
return 0;
input_failed:
- ideapad_platform_exit();
+ ideapad_platform_exit(priv);
platform_failed:
kfree(priv);
return ret;
@@ -447,8 +448,8 @@ static int __devexit ideapad_acpi_remove(struct acpi_device *adevice, int type)
for (i = IDEAPAD_DEV_WLAN; i < IDEAPAD_DEV_KILLSW; i++)
ideapad_unregister_rfkill(adevice, i);
- ideapad_input_exit();
- ideapad_platform_exit();
+ ideapad_input_exit(priv);
+ ideapad_platform_exit(priv);
dev_set_drvdata(&adevice->dev, NULL);
kfree(priv);
@@ -457,6 +458,7 @@ static int __devexit ideapad_acpi_remove(struct acpi_device *adevice, int type)
static void ideapad_acpi_notify(struct acpi_device *adevice, u32 event)
{
+ struct ideapad_private *priv = dev_get_drvdata(&adevice->dev);
acpi_handle handle = adevice->handle;
unsigned long vpc1, vpc2, vpc_bit;
@@ -471,7 +473,7 @@ static void ideapad_acpi_notify(struct acpi_device *adevice, u32 event)
if (vpc_bit == 9)
ideapad_sync_rfk_state(adevice);
else
- ideapad_input_report(vpc_bit);
+ ideapad_input_report(priv, vpc_bit);
}
}
}
--
1.7.1
next prev parent reply other threads:[~2010-12-13 10:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-13 9:59 [PATCH v3 0/6] ideapad: hotkey enablement Ike Panhc
2010-12-13 10:00 ` [PATCH 1/6] ideapad: add platform driver for ideapad Ike Panhc
2010-12-13 10:00 ` [PATCH 2/6] ideapad: let camera power control entry under platform driver Ike Panhc
2010-12-13 10:00 ` [PATCH 3/6] ideapad: add hotkey support Ike Panhc
2010-12-13 10:00 ` [PATCH 4/6] ideapad: add markups, unify comments and return result when init Ike Panhc
2010-12-13 10:01 ` Ike Panhc [this message]
2010-12-13 10:01 ` [PATCH 6/6] ideapad: pass ideapad_priv as argument (part 2) Ike Panhc
2010-12-20 16:14 ` [PATCH v3 0/6] ideapad: hotkey enablement Matthew Garrett
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=1292234461-2744-1-git-send-email-ike.pan@canonical.com \
--to=ike.pan@canonical.com \
--cc=corentin.chary@gmail.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
all inboxes | Powered by JetHome®