applied. thanks, -Len >-----Original Message----- >From: linux-acpi-owner@xxxxxxxxxxxxxxx >[mailto:linux-acpi-owner@xxxxxxxxxxxxxxx] On Behalf Of akpm@xxxxxxxx >Sent: Tuesday, March 28, 2006 5:04 PM >To: Brown, Len >Cc: linux-acpi@xxxxxxxxxxxxxxx; akpm@xxxxxxxx; bjorn.helgaas@xxxxxx >Subject: [patch 18/26] ACPI: remove __init/__exit from Asus >.add()/.remove() methods > > >From: Bjorn Helgaas <bjorn.helgaas@xxxxxx> > >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@xxxxxx> >Signed-off-by: Andrew Morton <akpm@xxxxxxxx> >--- > > drivers/acpi/asus_acpi.c | 10 +++++----- > 1 files changed, 5 insertions(+), 5 deletions(-) > >diff -puN >drivers/acpi/asus_acpi.c~acpi-remove-__init-__exit-from-asus-ad >d-remove-methods drivers/acpi/asus_acpi.c >--- >devel/drivers/acpi/asus_acpi.c~acpi-remove-__init-__exit-from-a >sus-add-remove-methods 2006-03-28 14:03:06.000000000 -0800 >+++ devel-akpm/drivers/acpi/asus_acpi.c 2006-03-28 >14:03:06.000000000 -0800 >@@ -817,7 +817,7 @@ typedef int (proc_writefunc) (struct fil > 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_wr > 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 > * 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(voi > return AE_OK; > } > >-static int __init asus_hotk_check(void) >+static int asus_hotk_check(void) > { > int result = 0; > >@@ -1121,7 +1121,7 @@ static int __init asus_hotk_check(void) > > static int asus_hotk_found; > >-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; >_ >- >To unsubscribe from this list: send the line "unsubscribe >linux-acpi" in >the body of a message to majordomo@xxxxxxxxxxxxxxx >More majordomo info at http://vger.kernel.org/majordomo-info.html > - To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
