Skip to content

Commit

Permalink
ACPI: remove __init/__exit from Asus .add()/.remove() methods
Browse files Browse the repository at this point in the history
Even though the devices claimed by asus_acpi.c can not be hot-plugged, the
driver registration infrastructure allows the .add() and .remove() methods to
be called at any time while the driver is registered.  So remove __init and
__exit from them.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Bjorn Helgaas authored and Len Brown committed Apr 2, 2006
1 parent 1a36561 commit 200739c
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/acpi/asus_acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,7 @@ typedef int (proc_writefunc) (struct file * file, const char __user * buffer,
unsigned long count, void *data);

static int
__init asus_proc_add(char *name, proc_writefunc * writefunc,
asus_proc_add(char *name, proc_writefunc * writefunc,
proc_readfunc * readfunc, mode_t mode,
struct acpi_device *device)
{
Expand All @@ -836,7 +836,7 @@ __init asus_proc_add(char *name, proc_writefunc * writefunc,
return 0;
}

static int __init asus_hotk_add_fs(struct acpi_device *device)
static int asus_hotk_add_fs(struct acpi_device *device)
{
struct proc_dir_entry *proc;
mode_t mode;
Expand Down Expand Up @@ -954,7 +954,7 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
* This function is used to initialize the hotk with right values. In this
* method, we can make all the detection we want, and modify the hotk struct
*/
static int __init asus_hotk_get_info(void)
static int asus_hotk_get_info(void)
{
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
struct acpi_buffer dsdt = { ACPI_ALLOCATE_BUFFER, NULL };
Expand Down Expand Up @@ -1101,7 +1101,7 @@ static int __init asus_hotk_get_info(void)
return AE_OK;
}

static int __init asus_hotk_check(void)
static int asus_hotk_check(void)
{
int result = 0;

Expand All @@ -1119,7 +1119,7 @@ static int __init asus_hotk_check(void)
return result;
}

static int __init asus_hotk_add(struct acpi_device *device)
static int asus_hotk_add(struct acpi_device *device)
{
acpi_status status = AE_OK;
int result;
Expand Down

0 comments on commit 200739c

Please sign in to comment.