From: Adrian Bunk <bunk@stusta.de>
To: Andrew Morton <akpm@osdl.org>, Timo Hoenig <thoenig@suse.de>
Cc: linux-kernel@vger.kernel.org, len.brown@intel.com,
acpi-devel@lists.sourceforge.net
Subject: [2.6.11-rc5-mm1 patch] drivers/acpi/pcc_acpi.c: section fixes
Date: Thu, 3 Mar 2005 14:22:20 +0100 [thread overview]
Message-ID: <20050303132220.GQ4608@stusta.de> (raw)
In-Reply-To: <20050301012741.1d791cd2.akpm@osdl.org>
This patch fixes the following:
- acpi_pcc_hotkey_add: although the function prototype was marked
__devinit, the actual function wasn't
- acpi_pcc_proc_init is called by acpi_pcc_hotkey_remove and
therefore has to be __devinit
- acpi_pcc_hotkey_remove: although the function prototype was marked
__devexit, the actual function wasn't
- acpi_pcc_remove_device is called by acpi_pcc_hotkey_remove and
therefore has to be __devexit
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
drivers/acpi/pcc_acpi.c | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
--- linux-2.6.11-rc5-mm1-full/drivers/acpi/pcc_acpi.c.old 2005-03-02 10:57:35.000000000 +0100
+++ linux-2.6.11-rc5-mm1-full/drivers/acpi/pcc_acpi.c 2005-03-02 11:04:11.000000000 +0100
@@ -643,9 +643,9 @@
{ NULL, NULL, 0 },
};
-static int __init acpi_pcc_add_device(struct acpi_device *device,
- ProcItem *proc_items,
- int num)
+static int __devinit acpi_pcc_add_device(struct acpi_device *device,
+ ProcItem *proc_items,
+ int num)
{
struct acpi_hotkey *hotkey = \
(struct acpi_hotkey*)acpi_driver_data(device);
@@ -675,7 +675,7 @@
return 0;
}
-static int __init acpi_pcc_proc_init(struct acpi_device *device)
+static int __devinit acpi_pcc_proc_init(struct acpi_device *device)
{
acpi_status status;
struct acpi_hotkey *hotkey = \
@@ -707,9 +707,9 @@
return status;
}
-static void __exit acpi_pcc_remove_device(struct acpi_device *device,
- ProcItem *proc_items,
- int num)
+static void __devexit acpi_pcc_remove_device(struct acpi_device *device,
+ ProcItem *proc_items,
+ int num)
{
struct acpi_hotkey *hotkey =
(struct acpi_hotkey*)acpi_driver_data(device);
@@ -791,7 +791,7 @@
}
/* module init */
-static int acpi_pcc_hotkey_add (struct acpi_device *device)
+static int __devinit acpi_pcc_hotkey_add (struct acpi_device *device)
{
acpi_status status;
struct acpi_hotkey *hotkey = NULL;
@@ -851,7 +851,8 @@
return acpi_pcc_proc_init(device);
}
-static int acpi_pcc_hotkey_remove(struct acpi_device *device, int type)
+static int __devexit acpi_pcc_hotkey_remove(struct acpi_device *device,
+ int type)
{
acpi_status status;
struct acpi_hotkey *hotkey = acpi_driver_data(device);
prev parent reply other threads:[~2005-03-03 13:22 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-03-01 9:27 2.6.11-rc5-mm1 Andrew Morton
2005-03-01 13:36 ` 2.6.11-rc5-mm1 Valdis.Kletnieks
2005-03-01 13:55 ` 2.6.11-rc5-mm1 Russell King
2005-03-01 15:18 ` 2.6.11-rc5-mm1 Valdis.Kletnieks
2005-03-01 15:27 ` 2.6.11-rc5-mm1 Russell King
2005-03-01 20:42 ` 2.6.11-rc5-mm1 Andrew Morton
2005-03-01 20:45 ` 2.6.11-rc5-mm1 Greg KH
2005-03-01 13:53 ` 2.6.11-rc5-mm1 Mathieu Segaud
2005-03-01 14:00 ` 2.6.11-rc5-mm1 Mathieu Segaud
2005-03-01 14:06 ` 2.6.11-rc5-mm1 Mathieu Segaud
2005-03-01 15:06 ` 2.6.11-rc5-mm1 Edward Shishkin
2005-03-01 15:53 ` 2.6.11-rc5-mm1 (compile stats) John Cherry
2005-03-01 17:40 ` 2.6.11-rc5-mm1 Aurélien Francillon
2005-03-02 8:53 ` 2.6.11-rc5-mm1 Andrew Morton
2005-03-02 15:45 ` 2.6.11-rc5-mm1 Andreas Gruenbacher
2005-03-03 11:01 ` 2.6.11-rc5-mm1 Aurélien Francillon
2005-03-01 20:16 ` 2.6.11-rc5-mm1 Adrian Bunk
2005-03-01 21:58 ` 2.6.11-rc5-mm1 Andrew Morton
2005-03-01 21:49 ` 2.6.11-rc5-mm1 Chris Wright
2005-03-01 22:08 ` 2.6.11-rc5-mm1 Andrew Morton
2005-03-03 8:04 ` 2.6.11-rc5-mm1 Jeff Dike
2005-03-03 16:21 ` 2.6.11-rc5-mm1 Chris Wright
2005-03-03 19:25 ` 2.6.11-rc5-mm1 Jeff Dike
2005-03-03 19:14 ` 2.6.11-rc5-mm1 Chris Wright
2005-03-04 11:01 ` 2.6.11-rc5-mm1 zwx
2005-03-01 23:43 ` [2.6.11-rc5-mm1 patch] reiser4 Kconfig help cleanup Adrian Bunk
2005-03-02 9:01 ` Jes Sorensen
2005-03-02 9:14 ` Andrew Morton
2005-03-02 14:29 ` Nikita Danilov
2005-03-02 14:40 ` [2.6.11-rc5-mm1 patch] reiser4 cleanup (PG_arch_1) Vladimir Saveliev
2005-03-03 13:17 ` [2.6.11-rc5-mm1 patch] fs/reiser4/: possible cleanups Adrian Bunk
2005-03-03 13:22 ` Adrian Bunk [this message]
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=20050303132220.GQ4608@stusta.de \
--to=bunk@stusta.de \
--cc=acpi-devel@lists.sourceforge.net \
--cc=akpm@osdl.org \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=thoenig@suse.de \
/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