From: Bill Pemberton Date: Mon, 19 Nov 2012 18:22:46 +0000 (-0500) Subject: acpi: remove use of __devinit X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=da095fd3d5063f2dd03468d71f7df39a0430d86f;p=deliverable%2Flinux.git acpi: remove use of __devinit CONFIG_HOTPLUG is going away as an option so __devinit is no longer needed. Signed-off-by: Bill Pemberton Acked-by: Rafael J. Wysocki Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index 1599566ed1fe..73bca1141fa7 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -901,7 +901,7 @@ static unsigned long ghes_esource_prealloc_size( return prealloc_size; } -static int __devinit ghes_probe(struct platform_device *ghes_dev) +static int ghes_probe(struct platform_device *ghes_dev) { struct acpi_hest_generic *generic; struct ghes *ghes = NULL; diff --git a/drivers/acpi/hed.c b/drivers/acpi/hed.c index 20a0f2c3ca3b..0ec28a38f607 100644 --- a/drivers/acpi/hed.c +++ b/drivers/acpi/hed.c @@ -61,7 +61,7 @@ static void acpi_hed_notify(struct acpi_device *device, u32 event) blocking_notifier_call_chain(&acpi_hed_notify_list, 0, NULL); } -static int __devinit acpi_hed_add(struct acpi_device *device) +static int acpi_hed_add(struct acpi_device *device) { /* Only one hardware error device */ if (hed_handle) diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index bce469c0b48a..f70b9e5fc1b5 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -445,7 +445,7 @@ out: } EXPORT_SYMBOL(acpi_pci_osc_control_set); -static int __devinit acpi_pci_root_add(struct acpi_device *device) +static int acpi_pci_root_add(struct acpi_device *device) { unsigned long long segment, bus; acpi_status status;