aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-21 23:13:09 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-11-21 23:13:09 +0100
commitb59bc2fbb4bb67e486c40cdb6a306c06acbaec06 (patch)
treea921b0244eff2ef9b71d6f7e32f9b49c00b25313 /drivers/acpi
parentACPI / PM: Add Sony Vaio VPCEB1S1E to nonvs blacklist. (diff)
downloadlinux-dev-b59bc2fbb4bb67e486c40cdb6a306c06acbaec06.tar.xz
linux-dev-b59bc2fbb4bb67e486c40cdb6a306c06acbaec06.zip
ACPI: remove use of __devexit
CONFIG_HOTPLUG is going away as an option so __devexit is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/apei/ghes.c2
-rw-r--r--drivers/acpi/hed.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 1599566ed1fe..da93c003e953 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -994,7 +994,7 @@ err:
return rc;
}
-static int __devexit ghes_remove(struct platform_device *ghes_dev)
+static int ghes_remove(struct platform_device *ghes_dev)
{
struct ghes *ghes;
struct acpi_hest_generic *generic;
diff --git a/drivers/acpi/hed.c b/drivers/acpi/hed.c
index 20a0f2c3ca3b..b514e81e8cfa 100644
--- a/drivers/acpi/hed.c
+++ b/drivers/acpi/hed.c
@@ -70,7 +70,7 @@ static int __devinit acpi_hed_add(struct acpi_device *device)
return 0;
}
-static int __devexit acpi_hed_remove(struct acpi_device *device, int type)
+static int acpi_hed_remove(struct acpi_device *device, int type)
{
hed_handle = NULL;
return 0;