Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 200739c1 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

ACPI: remove __init/__exit from Asus .add()/.remove() methods 



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: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 1a365616

drivers/acpi/asus_acpi.c

+5 −5
Original line number Diff line number Diff line
@@ -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)

{
@@ -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;
@@ -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 };
@@ -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;
@@ -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;