52 files changed, 1050 insertions, 1077 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 114cf48085ab..54e9729f9634 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -189,17 +189,24 @@ config ACPI_DOCK
          This driver supports ACPI-controlled docking stations and removable
          drive bays such as the IBM Ultrabay and the Dell Module Bay.
-config ACPI_PROCESSOR
+config ACPI_CPU_FREQ_PSS
-        tristate "Processor"
+        bool
        select THERMAL
+config ACPI_PROCESSOR_IDLE
+        bool
        select CPU_IDLE
+config ACPI_PROCESSOR
+        tristate "Processor"
        depends on X86 || IA64
+        select ACPI_PROCESSOR_IDLE
+        select ACPI_CPU_FREQ_PSS
        default y
        help
-          This driver installs ACPI as the idle handler for Linux and uses
+          This driver adds support for the ACPI Processor package. It is required
-          ACPI C2 and C3 processor states to save power on systems that
+          by several flavors of cpufreq performance-state, thermal, throttling and
-          support it.  It is required by several flavors of cpufreq
+          idle drivers.
-          performance-state drivers.
          To compile this driver as a module, choose M here:
          the module will be called processor.
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 8321430d7f24..b5e7cd8a9c71 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -24,7 +24,7 @@ acpi-y				+= nvs.o
 # Power management related files
 acpi-y                          += wakeup.o
 acpi-$(CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT) += sleep.o
-acpi-y                          += device_pm.o
+acpi-y                          += device_sysfs.o device_pm.o
 acpi-$(CONFIG_ACPI_SLEEP)       += proc.o
@@ -80,8 +80,10 @@ obj-$(CONFIG_ACPI_CUSTOM_METHOD)+= custom_method.o
 obj-$(CONFIG_ACPI_BGRT)         += bgrt.o
 # processor has its own "processor." module_param namespace
-processor-y                     := processor_driver.o processor_throttling.o
+processor-y                     := processor_driver.o
-processor-y                     += processor_idle.o processor_thermal.o
+processor-$(CONFIG_ACPI_PROCESSOR_IDLE) += processor_idle.o
+processor-$(CONFIG_ACPI_CPU_FREQ_PSS)   += processor_throttling.o       \
+        processor_thermal.o
 processor-$(CONFIG_CPU_FREQ)    += processor_perflib.o
 obj-$(CONFIG_ACPI_PROCESSOR_AGGREGATOR) += acpi_pad.o
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index 9b5354a2cd08..f71b756b05c4 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -16,10 +16,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
diff --git a/drivers/acpi/acpi_ipmi.c b/drivers/acpi/acpi_ipmi.c
index ac0f52f6df2b..f77956c3fd45 100644
--- a/drivers/acpi/acpi_ipmi.c
+++ b/drivers/acpi/acpi_ipmi.c
@@ -17,10 +17,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index ee28f4d15625..6b0d3ef7309c 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -16,11 +16,6 @@
 * NON INFRINGEMENT.  See the GNU General Public License for more
 * details.
 *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *
 * ACPI based HotPlug driver that supports Memory Hotplug
 * This driver fields notifications from firmware for memory add
 * and remove operations and alerts the VM of the affected memory
diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c
index 00b39802d7ec..ae307ff36acb 100644
--- a/drivers/acpi/acpi_pad.c
+++ b/drivers/acpi/acpi_pad.c
@@ -12,10 +12,6 @@
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 * more details.
 *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
 */
 #include <linux/kernel.h>
diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c
index 92a5f738e370..985b8a83184e 100644
--- a/drivers/acpi/acpi_processor.c
+++ b/drivers/acpi/acpi_processor.c
@@ -485,7 +485,7 @@ static const struct acpi_device_id processor_device_ids[] = {
        { }
 };
-static struct acpi_scan_handler __refdata processor_handler = {
+static struct acpi_scan_handler processor_handler = {
        .ids = processor_device_ids,
        .attach = acpi_processor_add,
 #ifdef CONFIG_ACPI_HOTPLUG_CPU
diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
index 8c2fe2f2f9fd..5778e8e4313a 100644
--- a/drivers/acpi/acpi_video.c
+++ b/drivers/acpi/acpi_video.c
@@ -17,10 +17,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
index a85ac07f3da3..a2c8d7adb6eb 100644
--- a/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
@@ -24,10 +24,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 #include <linux/kernel.h>
diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c
index a095d4f858da..0431883653be 100644
--- a/drivers/acpi/apei/einj.c
+++ b/drivers/acpi/apei/einj.c
@@ -18,10 +18,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 #include <linux/kernel.h>
diff --git a/drivers/acpi/apei/erst-dbg.c b/drivers/acpi/apei/erst-dbg.c
index 04ab5c9d3ced..6330f557a2c8 100644
--- a/drivers/acpi/apei/erst-dbg.c
+++ b/drivers/acpi/apei/erst-dbg.c
@@ -17,10 +17,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 #include <linux/kernel.h>
diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
index 3670bbab57a3..6682c5daf742 100644
--- a/drivers/acpi/apei/erst.c
+++ b/drivers/acpi/apei/erst.c
@@ -18,10 +18,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 #include <linux/kernel.h>
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 2bfd53cbfe80..23981ac1c6c2 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -23,10 +23,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 #include <linux/kernel.h>
diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
index 06e9b411a0a2..20b3fcf4007c 100644
--- a/drivers/acpi/apei/hest.c
+++ b/drivers/acpi/apei/hest.c
@@ -21,10 +21,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 #include <linux/kernel.h>
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index b3628cc01a53..b719ab3090bb 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -18,10 +18,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index 278dc4be992a..96809cd99ace 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -20,10 +20,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 513e7230e3d0..54a2e66ce236 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -15,10 +15,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
@@ -423,6 +419,384 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data)
        acpi_evaluate_ost(handle, type, ost_code, NULL);
 }
+static void acpi_device_notify(acpi_handle handle, u32 event, void *data)
+{
+        struct acpi_device *device = data;
+        device->driver->ops.notify(device, event);
+}
+static void acpi_device_notify_fixed(void *data)
+{
+        struct acpi_device *device = data;
+        /* Fixed hardware devices have no handles */
+        acpi_device_notify(NULL, ACPI_FIXED_HARDWARE_EVENT, device);
+}
+static u32 acpi_device_fixed_event(void *data)
+{
+        acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_device_notify_fixed, data);
+        return ACPI_INTERRUPT_HANDLED;
+}
+static int acpi_device_install_notify_handler(struct acpi_device *device)
+{
+        acpi_status status;
+        if (device->device_type == ACPI_BUS_TYPE_POWER_BUTTON)
+                status =
+                    acpi_install_fixed_event_handler(ACPI_EVENT_POWER_BUTTON,
+                                                     acpi_device_fixed_event,
+                                                     device);
+        else if (device->device_type == ACPI_BUS_TYPE_SLEEP_BUTTON)
+                status =
+                    acpi_install_fixed_event_handler(ACPI_EVENT_SLEEP_BUTTON,
+                                                     acpi_device_fixed_event,
+                                                     device);
+        else
+                status = acpi_install_notify_handler(device->handle,
+                                                     ACPI_DEVICE_NOTIFY,
+                                                     acpi_device_notify,
+                                                     device);
+        if (ACPI_FAILURE(status))
+                return -EINVAL;
+        return 0;
+}
+static void acpi_device_remove_notify_handler(struct acpi_device *device)
+{
+        if (device->device_type == ACPI_BUS_TYPE_POWER_BUTTON)
+                acpi_remove_fixed_event_handler(ACPI_EVENT_POWER_BUTTON,
+                                                acpi_device_fixed_event);
+        else if (device->device_type == ACPI_BUS_TYPE_SLEEP_BUTTON)
+                acpi_remove_fixed_event_handler(ACPI_EVENT_SLEEP_BUTTON,
+                                                acpi_device_fixed_event);
+        else
+                acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY,
+                                           acpi_device_notify);
+}
+/* --------------------------------------------------------------------------
+                             Device Matching
+   -------------------------------------------------------------------------- */
+/*
+ * acpi_companion_match() - Can we match via ACPI companion device
+ * @dev: Device in question
+ *
+ * Check if the given device has an ACPI companion and if that companion has
+ * a valid list of PNP IDs, and if the device is the first (primary) physical
+ * device associated with it.  Return the companion pointer if that's the case
+ * or NULL otherwise.
+ *
+ * If multiple physical devices are attached to a single ACPI companion, we need
+ * to be careful.  The usage scenario for this kind of relationship is that all
+ * of the physical devices in question use resources provided by the ACPI
+ * companion.  A typical case is an MFD device where all the sub-devices share
+ * the parent's ACPI companion.  In such cases we can only allow the primary
+ * (first) physical device to be matched with the help of the companion's PNP
+ * IDs.
+ *
+ * Additional physical devices sharing the ACPI companion can still use
+ * resources available from it but they will be matched normally using functions
+ * provided by their bus types (and analogously for their modalias).
+ */
+struct acpi_device *acpi_companion_match(const struct device *dev)
+{
+        struct acpi_device *adev;
+        struct mutex *physical_node_lock;
+        adev = ACPI_COMPANION(dev);
+        if (!adev)
+                return NULL;
+        if (list_empty(&adev->pnp.ids))
+                return NULL;
+        physical_node_lock = &adev->physical_node_lock;
+        mutex_lock(physical_node_lock);
+        if (list_empty(&adev->physical_node_list)) {
+                adev = NULL;
+        } else {
+                const struct acpi_device_physical_node *node;
+                node = list_first_entry(&adev->physical_node_list,
+                                        struct acpi_device_physical_node, node);
+                if (node->dev != dev)
+                        adev = NULL;
+        }
+        mutex_unlock(physical_node_lock);
+        return adev;
+}
+/**
+ * acpi_of_match_device - Match device object using the "compatible" property.
+ * @adev: ACPI device object to match.
+ * @of_match_table: List of device IDs to match against.
+ *
+ * If @dev has an ACPI companion which has ACPI_DT_NAMESPACE_HID in its list of
+ * identifiers and a _DSD object with the "compatible" property, use that
+ * property to match against the given list of identifiers.
+ */
+static bool acpi_of_match_device(struct acpi_device *adev,
+                                 const struct of_device_id *of_match_table)
+{
+        const union acpi_object *of_compatible, *obj;
+        int i, nval;
+        if (!adev)
+                return false;
+        of_compatible = adev->data.of_compatible;
+        if (!of_match_table || !of_compatible)
+                return false;
+        if (of_compatible->type == ACPI_TYPE_PACKAGE) {
+                nval = of_compatible->package.count;
+                obj = of_compatible->package.elements;
+        } else { /* Must be ACPI_TYPE_STRING. */
+                nval = 1;
+                obj = of_compatible;
+        }
+        /* Now we can look for the driver DT compatible strings */
+        for (i = 0; i < nval; i++, obj++) {
+                const struct of_device_id *id;
+                for (id = of_match_table; id->compatible[0]; id++)
+                        if (!strcasecmp(obj->string.pointer, id->compatible))
+                                return true;
+        }
+        return false;
+}
+static bool __acpi_match_device_cls(const struct acpi_device_id *id,
+                                    struct acpi_hardware_id *hwid)
+{
+        int i, msk, byte_shift;
+        char buf[3];
+        if (!id->cls)
+                return false;
+        /* Apply class-code bitmask, before checking each class-code byte */
+        for (i = 1; i <= 3; i++) {
+                byte_shift = 8 * (3 - i);
+                msk = (id->cls_msk >> byte_shift) & 0xFF;
+                if (!msk)
+                        continue;
+                sprintf(buf, "%02x", (id->cls >> byte_shift) & msk);
+                if (strncmp(buf, &hwid->id[(i - 1) * 2], 2))
+                        return false;
+        }
+        return true;
+}
+static const struct acpi_device_id *__acpi_match_device(
+        struct acpi_device *device,
+        const struct acpi_device_id *ids,
+        const struct of_device_id *of_ids)
+{
+        const struct acpi_device_id *id;
+        struct acpi_hardware_id *hwid;
+        /*
+         * If the device is not present, it is unnecessary to load device
+         * driver for it.
+         */
+        if (!device || !device->status.present)
+                return NULL;
+        list_for_each_entry(hwid, &device->pnp.ids, list) {
+                /* First, check the ACPI/PNP IDs provided by the caller. */
+                for (id = ids; id->id[0] || id->cls; id++) {
+                        if (id->id[0] && !strcmp((char *) id->id, hwid->id))
+                                return id;
+                        else if (id->cls && __acpi_match_device_cls(id, hwid))
+                                return id;
+                }
+                /*
+                 * Next, check ACPI_DT_NAMESPACE_HID and try to match the
+                 * "compatible" property if found.
+                 *
+                 * The id returned by the below is not valid, but the only
+                 * caller passing non-NULL of_ids here is only interested in
+                 * whether or not the return value is NULL.
+                 */
+                if (!strcmp(ACPI_DT_NAMESPACE_HID, hwid->id)
+                    && acpi_of_match_device(device, of_ids))
+                        return id;
+        }
+        return NULL;
+}
+/**
+ * acpi_match_device - Match a struct device against a given list of ACPI IDs
+ * @ids: Array of struct acpi_device_id object to match against.
+ * @dev: The device structure to match.
+ *
+ * Check if @dev has a valid ACPI handle and if there is a struct acpi_device
+ * object for that handle and use that object to match against a given list of
+ * device IDs.
+ *
+ * Return a pointer to the first matching ID on success or %NULL on failure.
+ */
+const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
+                                               const struct device *dev)
+{
+        return __acpi_match_device(acpi_companion_match(dev), ids, NULL);
+}
+EXPORT_SYMBOL_GPL(acpi_match_device);
+int acpi_match_device_ids(struct acpi_device *device,
+                          const struct acpi_device_id *ids)
+{
+        return __acpi_match_device(device, ids, NULL) ? 0 : -ENOENT;
+}
+EXPORT_SYMBOL(acpi_match_device_ids);
+bool acpi_driver_match_device(struct device *dev,
+                              const struct device_driver *drv)
+{
+        if (!drv->acpi_match_table)
+                return acpi_of_match_device(ACPI_COMPANION(dev),
+                                            drv->of_match_table);
+        return !!__acpi_match_device(acpi_companion_match(dev),
+                                     drv->acpi_match_table, drv->of_match_table);
+}
+EXPORT_SYMBOL_GPL(acpi_driver_match_device);
+/* --------------------------------------------------------------------------
+                              ACPI Driver Management
+   -------------------------------------------------------------------------- */
+/**
+ * acpi_bus_register_driver - register a driver with the ACPI bus
+ * @driver: driver being registered
+ *
+ * Registers a driver with the ACPI bus.  Searches the namespace for all
+ * devices that match the driver's criteria and binds.  Returns zero for
+ * success or a negative error status for failure.
+ */
+int acpi_bus_register_driver(struct acpi_driver *driver)
+{
+        int ret;
+        if (acpi_disabled)
+                return -ENODEV;
+        driver->drv.name = driver->name;
+        driver->drv.bus = &acpi_bus_type;
+        driver->drv.owner = driver->owner;
+        ret = driver_register(&driver->drv);
+        return ret;
+}
+EXPORT_SYMBOL(acpi_bus_register_driver);
+/**
+ * acpi_bus_unregister_driver - unregisters a driver with the ACPI bus
+ * @driver: driver to unregister
+ *
+ * Unregisters a driver with the ACPI bus.  Searches the namespace for all
+ * devices that match the driver's criteria and unbinds.
+ */
+void acpi_bus_unregister_driver(struct acpi_driver *driver)
+{
+        driver_unregister(&driver->drv);
+}
+EXPORT_SYMBOL(acpi_bus_unregister_driver);
+/* --------------------------------------------------------------------------
+                              ACPI Bus operations
+   -------------------------------------------------------------------------- */
+static int acpi_bus_match(struct device *dev, struct device_driver *drv)
+{
+        struct acpi_device *acpi_dev = to_acpi_device(dev);
+        struct acpi_driver *acpi_drv = to_acpi_driver(drv);
+        return acpi_dev->flags.match_driver
+                && !acpi_match_device_ids(acpi_dev, acpi_drv->ids);
+}
+static int acpi_device_uevent(struct device *dev, struct kobj_uevent_env *env)
+{
+        return __acpi_device_uevent_modalias(to_acpi_device(dev), env);
+}
+static int acpi_device_probe(struct device *dev)
+{
+        struct acpi_device *acpi_dev = to_acpi_device(dev);
+        struct acpi_driver *acpi_drv = to_acpi_driver(dev->driver);
+        int ret;
+        if (acpi_dev->handler && !acpi_is_pnp_device(acpi_dev))
+                return -EINVAL;
+        if (!acpi_drv->ops.add)
+                return -ENOSYS;
+        ret = acpi_drv->ops.add(acpi_dev);
+        if (ret)
+                return ret;
+        acpi_dev->driver = acpi_drv;
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                          "Driver [%s] successfully bound to device [%s]\n",
+                          acpi_drv->name, acpi_dev->pnp.bus_id));
+        if (acpi_drv->ops.notify) {
+                ret = acpi_device_install_notify_handler(acpi_dev);
+                if (ret) {
+                        if (acpi_drv->ops.remove)
+                                acpi_drv->ops.remove(acpi_dev);
+                        acpi_dev->driver = NULL;
+                        acpi_dev->driver_data = NULL;
+                        return ret;
+                }
+        }
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found driver [%s] for device [%s]\n",
+                          acpi_drv->name, acpi_dev->pnp.bus_id));
+        get_device(dev);
+        return 0;
+}
+static int acpi_device_remove(struct device * dev)
+{
+        struct acpi_device *acpi_dev = to_acpi_device(dev);
+        struct acpi_driver *acpi_drv = acpi_dev->driver;
+        if (acpi_drv) {
+                if (acpi_drv->ops.notify)
+                        acpi_device_remove_notify_handler(acpi_dev);
+                if (acpi_drv->ops.remove)
+                        acpi_drv->ops.remove(acpi_dev);
+        }
+        acpi_dev->driver = NULL;
+        acpi_dev->driver_data = NULL;
+        put_device(dev);
+        return 0;
+}
+struct bus_type acpi_bus_type = {
+        .name           = "acpi",
+        .match          = acpi_bus_match,
+        .probe          = acpi_device_probe,
+        .remove         = acpi_device_remove,
+        .uevent         = acpi_device_uevent,
+};
 /* --------------------------------------------------------------------------
                             Initialization/Cleanup
   -------------------------------------------------------------------------- */
@@ -661,7 +1035,9 @@ static int __init acpi_bus_init(void)
         */
        acpi_root_dir = proc_mkdir(ACPI_BUS_FILE_ROOT, NULL);
-        return 0;
+        result = bus_register(&acpi_bus_type);
+        if (!result)
+                return 0;
        /* Mimic structured exception handling */
      error1:
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 6d5d1832a588..5c3b0918d5fd 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -16,10 +16,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
diff --git a/drivers/acpi/cm_sbs.c b/drivers/acpi/cm_sbs.c
index 6c9ee68e46fb..d0918d421f90 100644
--- a/drivers/acpi/cm_sbs.c
+++ b/drivers/acpi/cm_sbs.c
@@ -11,10 +11,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index c8ead9f97375..12c240903c18 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -20,10 +20,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
 #include <linux/acpi.h>
diff --git a/drivers/acpi/debugfs.c b/drivers/acpi/debugfs.c
index 6b1919f6bd82..68bb305b977f 100644
--- a/drivers/acpi/debugfs.c
+++ b/drivers/acpi/debugfs.c
@@ -7,6 +7,8 @@
 #include <linux/debugfs.h>
 #include <linux/acpi.h>
+#include "internal.h"
 #define _COMPONENT              ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME("debugfs");
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index 88dbbb115285..da0867899d10 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -15,10 +15,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
diff --git a/drivers/acpi/device_sysfs.c b/drivers/acpi/device_sysfs.c
new file mode 100644
index 000000000000..4ab4582e586b
--- /dev/null
+++ b/drivers/acpi/device_sysfs.c
@@ -0,0 +1,521 @@
+/*
+ * drivers/acpi/device_sysfs.c - ACPI device sysfs attributes and modalias.
+ *
+ * Copyright (C) 2015, Intel Corp.
+ * Author: Mika Westerberg <mika.westerberg@linux.intel.com>
+ * Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+#include <linux/acpi.h>
+#include <linux/device.h>
+#include <linux/export.h>
+#include <linux/nls.h>
+#include "internal.h"
+/**
+ * create_pnp_modalias - Create hid/cid(s) string for modalias and uevent
+ * @acpi_dev: ACPI device object.
+ * @modalias: Buffer to print into.
+ * @size: Size of the buffer.
+ *
+ * Creates hid/cid(s) string needed for modalias and uevent
+ * e.g. on a device with hid:IBM0001 and cid:ACPI0001 you get:
+ * char *modalias: "acpi:IBM0001:ACPI0001"
+ * Return: 0: no _HID and no _CID
+ *         -EINVAL: output error
+ *         -ENOMEM: output is truncated
+*/
+static int create_pnp_modalias(struct acpi_device *acpi_dev, char *modalias,
+                               int size)
+{
+        int len;
+        int count;
+        struct acpi_hardware_id *id;
+        /*
+         * Since we skip ACPI_DT_NAMESPACE_HID from the modalias below, 0 should
+         * be returned if ACPI_DT_NAMESPACE_HID is the only ACPI/PNP ID in the
+         * device's list.
+         */
+        count = 0;
+        list_for_each_entry(id, &acpi_dev->pnp.ids, list)
+                if (strcmp(id->id, ACPI_DT_NAMESPACE_HID))
+                        count++;
+        if (!count)
+                return 0;
+        len = snprintf(modalias, size, "acpi:");
+        if (len <= 0)
+                return len;
+        size -= len;
+        list_for_each_entry(id, &acpi_dev->pnp.ids, list) {
+                if (!strcmp(id->id, ACPI_DT_NAMESPACE_HID))
+                        continue;
+                count = snprintf(&modalias[len], size, "%s:", id->id);
+                if (count < 0)
+                        return -EINVAL;
+                if (count >= size)
+                        return -ENOMEM;
+                len += count;
+                size -= count;
+        }
+        modalias[len] = '\0';
+        return len;
+}
+/**
+ * create_of_modalias - Creates DT compatible string for modalias and uevent
+ * @acpi_dev: ACPI device object.
+ * @modalias: Buffer to print into.
+ * @size: Size of the buffer.
+ *
+ * Expose DT compatible modalias as of:NnameTCcompatible.  This function should
+ * only be called for devices having ACPI_DT_NAMESPACE_HID in their list of
+ * ACPI/PNP IDs.
+ */
+static int create_of_modalias(struct acpi_device *acpi_dev, char *modalias,
+                              int size)
+{
+        struct acpi_buffer buf = { ACPI_ALLOCATE_BUFFER };
+        const union acpi_object *of_compatible, *obj;
+        int len, count;
+        int i, nval;
+        char *c;
+        acpi_get_name(acpi_dev->handle, ACPI_SINGLE_NAME, &buf);
+        /* DT strings are all in lower case */
+        for (c = buf.pointer; *c != '\0'; c++)
+                *c = tolower(*c);
+        len = snprintf(modalias, size, "of:N%sT", (char *)buf.pointer);
+        ACPI_FREE(buf.pointer);
+        if (len <= 0)
+                return len;
+        of_compatible = acpi_dev->data.of_compatible;
+        if (of_compatible->type == ACPI_TYPE_PACKAGE) {
+                nval = of_compatible->package.count;
+                obj = of_compatible->package.elements;
+        } else { /* Must be ACPI_TYPE_STRING. */
+                nval = 1;
+                obj = of_compatible;
+        }
+        for (i = 0; i < nval; i++, obj++) {
+                count = snprintf(&modalias[len], size, "C%s",
+                                 obj->string.pointer);
+                if (count < 0)
+                        return -EINVAL;
+                if (count >= size)
+                        return -ENOMEM;
+                len += count;
+                size -= count;
+        }
+        modalias[len] = '\0';
+        return len;
+}
+int __acpi_device_uevent_modalias(struct acpi_device *adev,
+                                  struct kobj_uevent_env *env)
+{
+        int len;
+        if (!adev)
+                return -ENODEV;
+        if (list_empty(&adev->pnp.ids))
+                return 0;
+        if (add_uevent_var(env, "MODALIAS="))
+                return -ENOMEM;
+        len = create_pnp_modalias(adev, &env->buf[env->buflen - 1],
+                                  sizeof(env->buf) - env->buflen);
+        if (len < 0)
+                return len;
+        env->buflen += len;
+        if (!adev->data.of_compatible)
+                return 0;
+        if (len > 0 && add_uevent_var(env, "MODALIAS="))
+                return -ENOMEM;
+        len = create_of_modalias(adev, &env->buf[env->buflen - 1],
+                                 sizeof(env->buf) - env->buflen);
+        if (len < 0)
+                return len;
+        env->buflen += len;
+        return 0;
+}
+/**
+ * acpi_device_uevent_modalias - uevent modalias for ACPI-enumerated devices.
+ *
+ * Create the uevent modalias field for ACPI-enumerated devices.
+ *
+ * Because other buses do not support ACPI HIDs & CIDs, e.g. for a device with
+ * hid:IBM0001 and cid:ACPI0001 you get: "acpi:IBM0001:ACPI0001".
+ */
+int acpi_device_uevent_modalias(struct device *dev, struct kobj_uevent_env *env)
+{
+        return __acpi_device_uevent_modalias(acpi_companion_match(dev), env);
+}
+EXPORT_SYMBOL_GPL(acpi_device_uevent_modalias);
+static int __acpi_device_modalias(struct acpi_device *adev, char *buf, int size)
+{
+        int len, count;
+        if (!adev)
+                return -ENODEV;
+        if (list_empty(&adev->pnp.ids))
+                return 0;
+        len = create_pnp_modalias(adev, buf, size - 1);
+        if (len < 0) {
+                return len;
+        } else if (len > 0) {
+                buf[len++] = '\n';
+                size -= len;
+        }
+        if (!adev->data.of_compatible)
+                return len;
+        count = create_of_modalias(adev, buf + len, size - 1);
+        if (count < 0) {
+                return count;
+        } else if (count > 0) {
+                len += count;
+                buf[len++] = '\n';
+        }
+        return len;
+}
+/**
+ * acpi_device_modalias - modalias sysfs attribute for ACPI-enumerated devices.
+ *
+ * Create the modalias sysfs attribute for ACPI-enumerated devices.
+ *
+ * Because other buses do not support ACPI HIDs & CIDs, e.g. for a device with
+ * hid:IBM0001 and cid:ACPI0001 you get: "acpi:IBM0001:ACPI0001".
+ */
+int acpi_device_modalias(struct device *dev, char *buf, int size)
+{
+        return __acpi_device_modalias(acpi_companion_match(dev), buf, size);
+}
+EXPORT_SYMBOL_GPL(acpi_device_modalias);
+static ssize_t
+acpi_device_modalias_show(struct device *dev, struct device_attribute *attr, char *buf) {
+        return __acpi_device_modalias(to_acpi_device(dev), buf, 1024);
+}
+static DEVICE_ATTR(modalias, 0444, acpi_device_modalias_show, NULL);
+static ssize_t real_power_state_show(struct device *dev,
+                                     struct device_attribute *attr, char *buf)
+{
+        struct acpi_device *adev = to_acpi_device(dev);
+        int state;
+        int ret;
+        ret = acpi_device_get_power(adev, &state);
+        if (ret)
+                return ret;
+        return sprintf(buf, "%s\n", acpi_power_state_string(state));
+}
+static DEVICE_ATTR(real_power_state, 0444, real_power_state_show, NULL);
+static ssize_t power_state_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct acpi_device *adev = to_acpi_device(dev);
+        return sprintf(buf, "%s\n", acpi_power_state_string(adev->power.state));
+}
+static DEVICE_ATTR(power_state, 0444, power_state_show, NULL);
+static ssize_t
+acpi_eject_store(struct device *d, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct acpi_device *acpi_device = to_acpi_device(d);
+        acpi_object_type not_used;
+        acpi_status status;
+        if (!count || buf[0] != '1')
+                return -EINVAL;
+        if ((!acpi_device->handler || !acpi_device->handler->hotplug.enabled)
+            && !acpi_device->driver)
+                return -ENODEV;
+        status = acpi_get_type(acpi_device->handle, &not_used);
+        if (ACPI_FAILURE(status) || !acpi_device->flags.ejectable)
+                return -ENODEV;
+        get_device(&acpi_device->dev);
+        status = acpi_hotplug_schedule(acpi_device, ACPI_OST_EC_OSPM_EJECT);
+        if (ACPI_SUCCESS(status))
+                return count;
+        put_device(&acpi_device->dev);
+        acpi_evaluate_ost(acpi_device->handle, ACPI_OST_EC_OSPM_EJECT,
+                          ACPI_OST_SC_NON_SPECIFIC_FAILURE, NULL);
+        return status == AE_NO_MEMORY ? -ENOMEM : -EAGAIN;
+}
+static DEVICE_ATTR(eject, 0200, NULL, acpi_eject_store);
+static ssize_t
+acpi_device_hid_show(struct device *dev, struct device_attribute *attr, char *buf) {
+        struct acpi_device *acpi_dev = to_acpi_device(dev);
+        return sprintf(buf, "%s\n", acpi_device_hid(acpi_dev));
+}
+static DEVICE_ATTR(hid, 0444, acpi_device_hid_show, NULL);
+static ssize_t acpi_device_uid_show(struct device *dev,
+                                    struct device_attribute *attr, char *buf)
+{
+        struct acpi_device *acpi_dev = to_acpi_device(dev);
+        return sprintf(buf, "%s\n", acpi_dev->pnp.unique_id);
+}
+static DEVICE_ATTR(uid, 0444, acpi_device_uid_show, NULL);
+static ssize_t acpi_device_adr_show(struct device *dev,
+                                    struct device_attribute *attr, char *buf)
+{
+        struct acpi_device *acpi_dev = to_acpi_device(dev);
+        return sprintf(buf, "0x%08x\n",
+                       (unsigned int)(acpi_dev->pnp.bus_address));
+}
+static DEVICE_ATTR(adr, 0444, acpi_device_adr_show, NULL);
+static ssize_t
+acpi_device_path_show(struct device *dev, struct device_attribute *attr, char *buf) {
+        struct acpi_device *acpi_dev = to_acpi_device(dev);
+        struct acpi_buffer path = {ACPI_ALLOCATE_BUFFER, NULL};
+        int result;
+        result = acpi_get_name(acpi_dev->handle, ACPI_FULL_PATHNAME, &path);
+        if (result)
+                goto end;
+        result = sprintf(buf, "%s\n", (char*)path.pointer);
+        kfree(path.pointer);
+end:
+        return result;
+}
+static DEVICE_ATTR(path, 0444, acpi_device_path_show, NULL);
+/* sysfs file that shows description text from the ACPI _STR method */
+static ssize_t description_show(struct device *dev,
+                                struct device_attribute *attr,
+                                char *buf) {
+        struct acpi_device *acpi_dev = to_acpi_device(dev);
+        int result;
+        if (acpi_dev->pnp.str_obj == NULL)
+                return 0;
+        /*
+         * The _STR object contains a Unicode identifier for a device.
+         * We need to convert to utf-8 so it can be displayed.
+         */
+        result = utf16s_to_utf8s(
+                (wchar_t *)acpi_dev->pnp.str_obj->buffer.pointer,
+                acpi_dev->pnp.str_obj->buffer.length,
+                UTF16_LITTLE_ENDIAN, buf,
+                PAGE_SIZE);
+        buf[result++] = '\n';
+        return result;
+}
+static DEVICE_ATTR(description, 0444, description_show, NULL);
+static ssize_t
+acpi_device_sun_show(struct device *dev, struct device_attribute *attr,
+                     char *buf) {
+        struct acpi_device *acpi_dev = to_acpi_device(dev);
+        acpi_status status;
+        unsigned long long sun;
+        status = acpi_evaluate_integer(acpi_dev->handle, "_SUN", NULL, &sun);
+        if (ACPI_FAILURE(status))
+                return -ENODEV;
+        return sprintf(buf, "%llu\n", sun);
+}
+static DEVICE_ATTR(sun, 0444, acpi_device_sun_show, NULL);
+static ssize_t status_show(struct device *dev, struct device_attribute *attr,
+                                char *buf) {
+        struct acpi_device *acpi_dev = to_acpi_device(dev);
+        acpi_status status;
+        unsigned long long sta;
+        status = acpi_evaluate_integer(acpi_dev->handle, "_STA", NULL, &sta);
+        if (ACPI_FAILURE(status))
+                return -ENODEV;
+        return sprintf(buf, "%llu\n", sta);
+}
+static DEVICE_ATTR_RO(status);
+/**
+ * acpi_device_setup_files - Create sysfs attributes of an ACPI device.
+ * @dev: ACPI device object.
+ */
+int acpi_device_setup_files(struct acpi_device *dev)
+{
+        struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
+        acpi_status status;
+        int result = 0;
+        /*
+         * Devices gotten from FADT don't have a "path" attribute
+         */
+        if (dev->handle) {
+                result = device_create_file(&dev->dev, &dev_attr_path);
+                if (result)
+                        goto end;
+        }
+        if (!list_empty(&dev->pnp.ids)) {
+                result = device_create_file(&dev->dev, &dev_attr_hid);
+                if (result)
+                        goto end;
+                result = device_create_file(&dev->dev, &dev_attr_modalias);
+                if (result)
+                        goto end;
+        }
+        /*
+         * If device has _STR, 'description' file is created
+         */
+        if (acpi_has_method(dev->handle, "_STR")) {
+                status = acpi_evaluate_object(dev->handle, "_STR",
+                                        NULL, &buffer);
+                if (ACPI_FAILURE(status))
+                        buffer.pointer = NULL;
+                dev->pnp.str_obj = buffer.pointer;
+                result = device_create_file(&dev->dev, &dev_attr_description);
+                if (result)
+                        goto end;
+        }
+        if (dev->pnp.type.bus_address)
+                result = device_create_file(&dev->dev, &dev_attr_adr);
+        if (dev->pnp.unique_id)
+                result = device_create_file(&dev->dev, &dev_attr_uid);
+        if (acpi_has_method(dev->handle, "_SUN")) {
+                result = device_create_file(&dev->dev, &dev_attr_sun);
+                if (result)
+                        goto end;
+        }
+        if (acpi_has_method(dev->handle, "_STA")) {
+                result = device_create_file(&dev->dev, &dev_attr_status);
+                if (result)
+                        goto end;
+        }
+        /*
+         * If device has _EJ0, 'eject' file is created that is used to trigger
+         * hot-removal function from userland.
+         */
+        if (acpi_has_method(dev->handle, "_EJ0")) {
+                result = device_create_file(&dev->dev, &dev_attr_eject);
+                if (result)
+                        return result;
+        }
+        if (dev->flags.power_manageable) {
+                result = device_create_file(&dev->dev, &dev_attr_power_state);
+                if (result)
+                        return result;
+                if (dev->power.flags.power_resources)
+                        result = device_create_file(&dev->dev,
+                                                    &dev_attr_real_power_state);
+        }
+end:
+        return result;
+}
+/**
+ * acpi_device_remove_files - Remove sysfs attributes of an ACPI device.
+ * @dev: ACPI device object.
+ */
+void acpi_device_remove_files(struct acpi_device *dev)
+{
+        if (dev->flags.power_manageable) {
+                device_remove_file(&dev->dev, &dev_attr_power_state);
+                if (dev->power.flags.power_resources)
+                        device_remove_file(&dev->dev,
+                                           &dev_attr_real_power_state);
+        }
+        /*
+         * If device has _STR, remove 'description' file
+         */
+        if (acpi_has_method(dev->handle, "_STR")) {
+                kfree(dev->pnp.str_obj);
+                device_remove_file(&dev->dev, &dev_attr_description);
+        }
+        /*
+         * If device has _EJ0, remove 'eject' file.
+         */
+        if (acpi_has_method(dev->handle, "_EJ0"))
+                device_remove_file(&dev->dev, &dev_attr_eject);
+        if (acpi_has_method(dev->handle, "_SUN"))
+                device_remove_file(&dev->dev, &dev_attr_sun);
+        if (dev->pnp.unique_id)
+                device_remove_file(&dev->dev, &dev_attr_uid);
+        if (dev->pnp.type.bus_address)
+                device_remove_file(&dev->dev, &dev_attr_adr);
+        device_remove_file(&dev->dev, &dev_attr_modalias);
+        device_remove_file(&dev->dev, &dev_attr_hid);
+        if (acpi_has_method(dev->handle, "_STA"))
+                device_remove_file(&dev->dev, &dev_attr_status);
+        if (dev->handle)
+                device_remove_file(&dev->dev, &dev_attr_path);
+}
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index a688aa243f6c..e8e128dede29 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -17,10 +17,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 9d4761d2f6b7..990446629935 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -22,10 +22,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index bea0bbaafa97..e297a480e135 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -16,10 +16,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
diff --git a/drivers/acpi/hed.c b/drivers/acpi/hed.c
index a322710b5ba4..5c67a6d8f803 100644
--- a/drivers/acpi/hed.c
+++ b/drivers/acpi/hed.c
@@ -15,10 +15,6 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 #include <linux/kernel.h>
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 4683a96932b9..2c195cd5ab1b 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -13,9 +13,6 @@
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 * more details.
 *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 */
 #ifndef _ACPI_INTERNAL_H_
@@ -70,7 +67,7 @@ void acpi_scan_hotplug_enabled(struct acpi_hotplug_profile *hotplug, bool val);
 #ifdef CONFIG_DEBUG_FS
 extern struct dentry *acpi_debugfs_dir;
-int acpi_debugfs_init(void);
+void acpi_debugfs_init(void);
 #else
 static inline void acpi_debugfs_init(void) { return; }
 #endif
@@ -93,12 +90,21 @@ int acpi_device_add(struct acpi_device *device,
                    void (*release)(struct device *));
 void acpi_init_device_object(struct acpi_device *device, acpi_handle handle,
                             int type, unsigned long long sta);
+int acpi_device_setup_files(struct acpi_device *dev);
+void acpi_device_remove_files(struct acpi_device *dev);
 void acpi_device_add_finalize(struct acpi_device *device);
 void acpi_free_pnp_ids(struct acpi_device_pnp *pnp);
 bool acpi_device_is_present(struct acpi_device *adev);
 bool acpi_device_is_battery(struct acpi_device *adev);
 /* --------------------------------------------------------------------------
+                     Device Matching and Notification
+   -------------------------------------------------------------------------- */
+struct acpi_device *acpi_companion_match(const struct device *dev);
+int __acpi_device_uevent_modalias(struct acpi_device *adev,
+                                  struct kobj_uevent_env *env);
+/* --------------------------------------------------------------------------
                                  Power Resource
   -------------------------------------------------------------------------- */
 int acpi_power_init(void);
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index acaa3b4ea504..72b6e9ef0ae9 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -15,10 +15,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 *
 */
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 6341cb523dc4..21c1e7156bfe 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -19,10 +19,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 *
 */
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 304eccb0ae5c..25fff35df82c 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -19,10 +19,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index cfd7581cc19f..2f5f84ced85f 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -17,10 +17,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 *
 * TBD: 
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 1b5569c092c6..393706a5261b 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -16,10 +16,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c
index 139d9e479370..7188e53b6b7c 100644
--- a/drivers/acpi/pci_slot.c
+++ b/drivers/acpi/pci_slot.c
@@ -20,10 +20,6 @@
 *  WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 */
 #include <linux/kernel.h>
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 93eac53b5110..45b47f2c9f03 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -16,10 +16,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index d9f71581b79b..51e658f21e95 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -21,10 +21,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
@@ -159,38 +155,28 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
        return NOTIFY_OK;
 }
-static struct notifier_block __refdata acpi_cpu_notifier = {
+static struct notifier_block acpi_cpu_notifier = {
            .notifier_call = acpi_cpu_soft_notify,
 };
-static int __acpi_processor_start(struct acpi_device *device)
+#ifdef CONFIG_ACPI_CPU_FREQ_PSS
+static int acpi_pss_perf_init(struct acpi_processor *pr,
+                struct acpi_device *device)
 {
-        struct acpi_processor *pr = acpi_driver_data(device);
-        acpi_status status;
        int result = 0;
-        if (!pr)
-                return -ENODEV;
-        if (pr->flags.need_hotplug_init)
-                return 0;
-#ifdef CONFIG_CPU_FREQ
        acpi_processor_ppc_has_changed(pr, 0);
-#endif
        acpi_processor_get_throttling_info(pr);
        if (pr->flags.throttling)
                pr->flags.limit = 1;
-        if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver)
-                acpi_processor_power_init(pr);
        pr->cdev = thermal_cooling_device_register("Processor", device,
                                                   &processor_cooling_ops);
        if (IS_ERR(pr->cdev)) {
                result = PTR_ERR(pr->cdev);
-                goto err_power_exit;
+                return result;
        }
        dev_dbg(&device->dev, "registered as cooling_device%d\n",
@@ -204,6 +190,7 @@ static int __acpi_processor_start(struct acpi_device *device)
                        "Failed to create sysfs link 'thermal_cooling'\n");
                goto err_thermal_unregister;
        }
        result = sysfs_create_link(&pr->cdev->device.kobj,
                                   &device->dev.kobj,
                                   "device");
@@ -213,17 +200,61 @@ static int __acpi_processor_start(struct acpi_device *device)
                goto err_remove_sysfs_thermal;
        }
-        status = acpi_install_notify_handler(device->handle, ACPI_DEVICE_NOTIFY,
-                                             acpi_processor_notify, device);
-        if (ACPI_SUCCESS(status))
-                return 0;
        sysfs_remove_link(&pr->cdev->device.kobj, "device");
 err_remove_sysfs_thermal:
        sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
 err_thermal_unregister:
        thermal_cooling_device_unregister(pr->cdev);
- err_power_exit:
+        return result;
+}
+static void acpi_pss_perf_exit(struct acpi_processor *pr,
+                struct acpi_device *device)
+{
+        if (pr->cdev) {
+                sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
+                sysfs_remove_link(&pr->cdev->device.kobj, "device");
+                thermal_cooling_device_unregister(pr->cdev);
+                pr->cdev = NULL;
+        }
+}
+#else
+static inline int acpi_pss_perf_init(struct acpi_processor *pr,
+                struct acpi_device *device)
+{
+        return 0;
+}
+static inline void acpi_pss_perf_exit(struct acpi_processor *pr,
+                struct acpi_device *device) {}
+#endif /* CONFIG_ACPI_CPU_FREQ_PSS */
+static int __acpi_processor_start(struct acpi_device *device)
+{
+        struct acpi_processor *pr = acpi_driver_data(device);
+        acpi_status status;
+        int result = 0;
+        if (!pr)
+                return -ENODEV;
+        if (pr->flags.need_hotplug_init)
+                return 0;
+        if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver)
+                acpi_processor_power_init(pr);
+        result = acpi_pss_perf_init(pr, device);
+        if (result)
+                goto err_power_exit;
+        status = acpi_install_notify_handler(device->handle, ACPI_DEVICE_NOTIFY,
+                                             acpi_processor_notify, device);
+        if (ACPI_SUCCESS(status))
+                return 0;
+err_power_exit:
        acpi_processor_power_exit(pr);
        return result;
 }
@@ -252,15 +283,10 @@ static int acpi_processor_stop(struct device *dev)
        pr = acpi_driver_data(device);
        if (!pr)
                return 0;
        acpi_processor_power_exit(pr);
-        if (pr->cdev) {
+        acpi_pss_perf_exit(pr, device);
-                sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
-                sysfs_remove_link(&pr->cdev->device.kobj, "device");
-                thermal_cooling_device_unregister(pr->cdev);
-                pr->cdev = NULL;
-        }
        return 0;
 }
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index d540f42c9232..175c86bee3a9 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -21,10 +21,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index cfc8aba72f86..53cfe8ba9799 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -20,10 +20,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 */
 #include <linux/kernel.h>
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c
index e003663b2f8e..1fed84a092c2 100644
--- a/drivers/acpi/processor_thermal.c
+++ b/drivers/acpi/processor_thermal.c
@@ -19,10 +19,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index 84243c32e29c..f170d746336d 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -19,10 +19,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
index f1c966e05078..15d22db05054 100644
--- a/drivers/acpi/resource.c
+++ b/drivers/acpi/resource.c
@@ -15,10 +15,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index 01504c819e8f..cb3dedb1beae 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -17,10 +17,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index ec256352f423..2fe5a37c385c 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -115,263 +115,6 @@ int acpi_scan_add_handler_with_hotplug(struct acpi_scan_handler *handler,
        return 0;
 }
-/**
- * create_pnp_modalias - Create hid/cid(s) string for modalias and uevent
- * @acpi_dev: ACPI device object.
- * @modalias: Buffer to print into.
- * @size: Size of the buffer.
- *
- * Creates hid/cid(s) string needed for modalias and uevent
- * e.g. on a device with hid:IBM0001 and cid:ACPI0001 you get:
- * char *modalias: "acpi:IBM0001:ACPI0001"
- * Return: 0: no _HID and no _CID
- *         -EINVAL: output error
- *         -ENOMEM: output is truncated
-*/
-static int create_pnp_modalias(struct acpi_device *acpi_dev, char *modalias,
-                               int size)
-{
-        int len;
-        int count;
-        struct acpi_hardware_id *id;
-        /*
-         * Since we skip ACPI_DT_NAMESPACE_HID from the modalias below, 0 should
-         * be returned if ACPI_DT_NAMESPACE_HID is the only ACPI/PNP ID in the
-         * device's list.
-         */
-        count = 0;
-        list_for_each_entry(id, &acpi_dev->pnp.ids, list)
-                if (strcmp(id->id, ACPI_DT_NAMESPACE_HID))
-                        count++;
-        if (!count)
-                return 0;
-        len = snprintf(modalias, size, "acpi:");
-        if (len <= 0)
-                return len;
-        size -= len;
-        list_for_each_entry(id, &acpi_dev->pnp.ids, list) {
-                if (!strcmp(id->id, ACPI_DT_NAMESPACE_HID))
-                        continue;
-                count = snprintf(&modalias[len], size, "%s:", id->id);
-                if (count < 0)
-                        return -EINVAL;
-                if (count >= size)
-                        return -ENOMEM;
-                len += count;
-                size -= count;
-        }
-        modalias[len] = '\0';
-        return len;
-}
-/**
- * create_of_modalias - Creates DT compatible string for modalias and uevent
- * @acpi_dev: ACPI device object.
- * @modalias: Buffer to print into.
- * @size: Size of the buffer.
- *
- * Expose DT compatible modalias as of:NnameTCcompatible.  This function should
- * only be called for devices having ACPI_DT_NAMESPACE_HID in their list of
- * ACPI/PNP IDs.
- */
-static int create_of_modalias(struct acpi_device *acpi_dev, char *modalias,
-                              int size)
-{
-        struct acpi_buffer buf = { ACPI_ALLOCATE_BUFFER };
-        const union acpi_object *of_compatible, *obj;
-        int len, count;
-        int i, nval;
-        char *c;
-        acpi_get_name(acpi_dev->handle, ACPI_SINGLE_NAME, &buf);
-        /* DT strings are all in lower case */
-        for (c = buf.pointer; *c != '\0'; c++)
-                *c = tolower(*c);
-        len = snprintf(modalias, size, "of:N%sT", (char *)buf.pointer);
-        ACPI_FREE(buf.pointer);
-        if (len <= 0)
-                return len;
-        of_compatible = acpi_dev->data.of_compatible;
-        if (of_compatible->type == ACPI_TYPE_PACKAGE) {
-                nval = of_compatible->package.count;
-                obj = of_compatible->package.elements;
-        } else { /* Must be ACPI_TYPE_STRING. */
-                nval = 1;
-                obj = of_compatible;
-        }
-        for (i = 0; i < nval; i++, obj++) {
-                count = snprintf(&modalias[len], size, "C%s",
-                                 obj->string.pointer);
-                if (count < 0)
-                        return -EINVAL;
-                if (count >= size)
-                        return -ENOMEM;
-                len += count;
-                size -= count;
-        }
-        modalias[len] = '\0';
-        return len;
-}
-/*
- * acpi_companion_match() - Can we match via ACPI companion device
- * @dev: Device in question
- *
- * Check if the given device has an ACPI companion and if that companion has
- * a valid list of PNP IDs, and if the device is the first (primary) physical
- * device associated with it.  Return the companion pointer if that's the case
- * or NULL otherwise.
- *
- * If multiple physical devices are attached to a single ACPI companion, we need
- * to be careful.  The usage scenario for this kind of relationship is that all
- * of the physical devices in question use resources provided by the ACPI
- * companion.  A typical case is an MFD device where all the sub-devices share
- * the parent's ACPI companion.  In such cases we can only allow the primary
- * (first) physical device to be matched with the help of the companion's PNP
- * IDs.
- *
- * Additional physical devices sharing the ACPI companion can still use
- * resources available from it but they will be matched normally using functions
- * provided by their bus types (and analogously for their modalias).
- */
-static struct acpi_device *acpi_companion_match(const struct device *dev)
-{
-        struct acpi_device *adev;
-        struct mutex *physical_node_lock;
-        adev = ACPI_COMPANION(dev);
-        if (!adev)
-                return NULL;
-        if (list_empty(&adev->pnp.ids))
-                return NULL;
-        physical_node_lock = &adev->physical_node_lock;
-        mutex_lock(physical_node_lock);
-        if (list_empty(&adev->physical_node_list)) {
-                adev = NULL;
-        } else {
-                const struct acpi_device_physical_node *node;
-                node = list_first_entry(&adev->physical_node_list,
-                                        struct acpi_device_physical_node, node);
-                if (node->dev != dev)
-                        adev = NULL;
-        }
-        mutex_unlock(physical_node_lock);
-        return adev;
-}
-static int __acpi_device_uevent_modalias(struct acpi_device *adev,
-                                         struct kobj_uevent_env *env)
-{
-        int len;
-        if (!adev)
-                return -ENODEV;
-        if (list_empty(&adev->pnp.ids))
-                return 0;
-        if (add_uevent_var(env, "MODALIAS="))
-                return -ENOMEM;
-        len = create_pnp_modalias(adev, &env->buf[env->buflen - 1],
-                                  sizeof(env->buf) - env->buflen);
-        if (len < 0)
-                return len;
-        env->buflen += len;
-        if (!adev->data.of_compatible)
-                return 0;
-        if (len > 0 && add_uevent_var(env, "MODALIAS="))
-                return -ENOMEM;
-        len = create_of_modalias(adev, &env->buf[env->buflen - 1],
-                                 sizeof(env->buf) - env->buflen);
-        if (len < 0)
-                return len;
-        env->buflen += len;
-        return 0;
-}
-/*
- * Creates uevent modalias field for ACPI enumerated devices.
- * Because the other buses does not support ACPI HIDs & CIDs.
- * e.g. for a device with hid:IBM0001 and cid:ACPI0001 you get:
- * "acpi:IBM0001:ACPI0001"
- */
-int acpi_device_uevent_modalias(struct device *dev, struct kobj_uevent_env *env)
-{
-        return __acpi_device_uevent_modalias(acpi_companion_match(dev), env);
-}
-EXPORT_SYMBOL_GPL(acpi_device_uevent_modalias);
-static int __acpi_device_modalias(struct acpi_device *adev, char *buf, int size)
-{
-        int len, count;
-        if (!adev)
-                return -ENODEV;
-        if (list_empty(&adev->pnp.ids))
-                return 0;
-        len = create_pnp_modalias(adev, buf, size - 1);
-        if (len < 0) {
-                return len;
-        } else if (len > 0) {
-                buf[len++] = '\n';
-                size -= len;
-        }
-        if (!adev->data.of_compatible)
-                return len;
-        count = create_of_modalias(adev, buf + len, size - 1);
-        if (count < 0) {
-                return count;
-        } else if (count > 0) {
-                len += count;
-                buf[len++] = '\n';
-        }
-        return len;
-}
-/*
- * Creates modalias sysfs attribute for ACPI enumerated devices.
- * Because the other buses does not support ACPI HIDs & CIDs.
- * e.g. for a device with hid:IBM0001 and cid:ACPI0001 you get:
- * "acpi:IBM0001:ACPI0001"
- */
-int acpi_device_modalias(struct device *dev, char *buf, int size)
-{
-        return __acpi_device_modalias(acpi_companion_match(dev), buf, size);
-}
-EXPORT_SYMBOL_GPL(acpi_device_modalias);
-static ssize_t
-acpi_device_modalias_show(struct device *dev, struct device_attribute *attr, char *buf) {
-        return __acpi_device_modalias(to_acpi_device(dev), buf, 1024);
-}
-static DEVICE_ATTR(modalias, 0444, acpi_device_modalias_show, NULL);
 bool acpi_scan_is_offline(struct acpi_device *adev, bool uevent)
 {
@@ -701,423 +444,6 @@ void acpi_device_hotplug(struct acpi_device *adev, u32 src)
        unlock_device_hotplug();
 }
-static ssize_t real_power_state_show(struct device *dev,
-                                     struct device_attribute *attr, char *buf)
-{
-        struct acpi_device *adev = to_acpi_device(dev);
-        int state;
-        int ret;
-        ret = acpi_device_get_power(adev, &state);
-        if (ret)
-                return ret;
-        return sprintf(buf, "%s\n", acpi_power_state_string(state));
-}
-static DEVICE_ATTR(real_power_state, 0444, real_power_state_show, NULL);
-static ssize_t power_state_show(struct device *dev,
-                                struct device_attribute *attr, char *buf)
-{
-        struct acpi_device *adev = to_acpi_device(dev);
-        return sprintf(buf, "%s\n", acpi_power_state_string(adev->power.state));
-}
-static DEVICE_ATTR(power_state, 0444, power_state_show, NULL);
-static ssize_t
-acpi_eject_store(struct device *d, struct device_attribute *attr,
-                const char *buf, size_t count)
-{
-        struct acpi_device *acpi_device = to_acpi_device(d);
-        acpi_object_type not_used;
-        acpi_status status;
-        if (!count || buf[0] != '1')
-                return -EINVAL;
-        if ((!acpi_device->handler || !acpi_device->handler->hotplug.enabled)
-            && !acpi_device->driver)
-                return -ENODEV;
-        status = acpi_get_type(acpi_device->handle, &not_used);
-        if (ACPI_FAILURE(status) || !acpi_device->flags.ejectable)
-                return -ENODEV;
-        get_device(&acpi_device->dev);
-        status = acpi_hotplug_schedule(acpi_device, ACPI_OST_EC_OSPM_EJECT);
-        if (ACPI_SUCCESS(status))
-                return count;
-        put_device(&acpi_device->dev);
-        acpi_evaluate_ost(acpi_device->handle, ACPI_OST_EC_OSPM_EJECT,
-                          ACPI_OST_SC_NON_SPECIFIC_FAILURE, NULL);
-        return status == AE_NO_MEMORY ? -ENOMEM : -EAGAIN;
-}
-static DEVICE_ATTR(eject, 0200, NULL, acpi_eject_store);
-static ssize_t
-acpi_device_hid_show(struct device *dev, struct device_attribute *attr, char *buf) {
-        struct acpi_device *acpi_dev = to_acpi_device(dev);
-        return sprintf(buf, "%s\n", acpi_device_hid(acpi_dev));
-}
-static DEVICE_ATTR(hid, 0444, acpi_device_hid_show, NULL);
-static ssize_t acpi_device_uid_show(struct device *dev,
-                                    struct device_attribute *attr, char *buf)
-{
-        struct acpi_device *acpi_dev = to_acpi_device(dev);
-        return sprintf(buf, "%s\n", acpi_dev->pnp.unique_id);
-}
-static DEVICE_ATTR(uid, 0444, acpi_device_uid_show, NULL);
-static ssize_t acpi_device_adr_show(struct device *dev,
-                                    struct device_attribute *attr, char *buf)
-{
-        struct acpi_device *acpi_dev = to_acpi_device(dev);
-        return sprintf(buf, "0x%08x\n",
-                       (unsigned int)(acpi_dev->pnp.bus_address));
-}
-static DEVICE_ATTR(adr, 0444, acpi_device_adr_show, NULL);
-static ssize_t
-acpi_device_path_show(struct device *dev, struct device_attribute *attr, char *buf) {
-        struct acpi_device *acpi_dev = to_acpi_device(dev);
-        struct acpi_buffer path = {ACPI_ALLOCATE_BUFFER, NULL};
-        int result;
-        result = acpi_get_name(acpi_dev->handle, ACPI_FULL_PATHNAME, &path);
-        if (result)
-                goto end;
-        result = sprintf(buf, "%s\n", (char*)path.pointer);
-        kfree(path.pointer);
-end:
-        return result;
-}
-static DEVICE_ATTR(path, 0444, acpi_device_path_show, NULL);
-/* sysfs file that shows description text from the ACPI _STR method */
-static ssize_t description_show(struct device *dev,
-                                struct device_attribute *attr,
-                                char *buf) {
-        struct acpi_device *acpi_dev = to_acpi_device(dev);
-        int result;
-        if (acpi_dev->pnp.str_obj == NULL)
-                return 0;
-        /*
-         * The _STR object contains a Unicode identifier for a device.
-         * We need to convert to utf-8 so it can be displayed.
-         */
-        result = utf16s_to_utf8s(
-                (wchar_t *)acpi_dev->pnp.str_obj->buffer.pointer,
-                acpi_dev->pnp.str_obj->buffer.length,
-                UTF16_LITTLE_ENDIAN, buf,
-                PAGE_SIZE);
-        buf[result++] = '\n';
-        return result;
-}
-static DEVICE_ATTR(description, 0444, description_show, NULL);
-static ssize_t
-acpi_device_sun_show(struct device *dev, struct device_attribute *attr,
-                     char *buf) {
-        struct acpi_device *acpi_dev = to_acpi_device(dev);
-        acpi_status status;
-        unsigned long long sun;
-        status = acpi_evaluate_integer(acpi_dev->handle, "_SUN", NULL, &sun);
-        if (ACPI_FAILURE(status))
-                return -ENODEV;
-        return sprintf(buf, "%llu\n", sun);
-}
-static DEVICE_ATTR(sun, 0444, acpi_device_sun_show, NULL);
-static ssize_t status_show(struct device *dev, struct device_attribute *attr,
-                                char *buf) {
-        struct acpi_device *acpi_dev = to_acpi_device(dev);
-        acpi_status status;
-        unsigned long long sta;
-        status = acpi_evaluate_integer(acpi_dev->handle, "_STA", NULL, &sta);
-        if (ACPI_FAILURE(status))
-                return -ENODEV;
-        return sprintf(buf, "%llu\n", sta);
-}
-static DEVICE_ATTR_RO(status);
-static int acpi_device_setup_files(struct acpi_device *dev)
-{
-        struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
-        acpi_status status;
-        int result = 0;
-        /*
-         * Devices gotten from FADT don't have a "path" attribute
-         */
-        if (dev->handle) {
-                result = device_create_file(&dev->dev, &dev_attr_path);
-                if (result)
-                        goto end;
-        }
-        if (!list_empty(&dev->pnp.ids)) {
-                result = device_create_file(&dev->dev, &dev_attr_hid);
-                if (result)
-                        goto end;
-                result = device_create_file(&dev->dev, &dev_attr_modalias);
-                if (result)
-                        goto end;
-        }
-        /*
-         * If device has _STR, 'description' file is created
-         */
-        if (acpi_has_method(dev->handle, "_STR")) {
-                status = acpi_evaluate_object(dev->handle, "_STR",
-                                        NULL, &buffer);
-                if (ACPI_FAILURE(status))
-                        buffer.pointer = NULL;
-                dev->pnp.str_obj = buffer.pointer;
-                result = device_create_file(&dev->dev, &dev_attr_description);
-                if (result)
-                        goto end;
-        }
-        if (dev->pnp.type.bus_address)
-                result = device_create_file(&dev->dev, &dev_attr_adr);
-        if (dev->pnp.unique_id)
-                result = device_create_file(&dev->dev, &dev_attr_uid);
-        if (acpi_has_method(dev->handle, "_SUN")) {
-                result = device_create_file(&dev->dev, &dev_attr_sun);
-                if (result)
-                        goto end;
-        }
-        if (acpi_has_method(dev->handle, "_STA")) {
-                result = device_create_file(&dev->dev, &dev_attr_status);
-                if (result)
-                        goto end;
-        }
-        /*
-         * If device has _EJ0, 'eject' file is created that is used to trigger
-         * hot-removal function from userland.
-         */
-        if (acpi_has_method(dev->handle, "_EJ0")) {
-                result = device_create_file(&dev->dev, &dev_attr_eject);
-                if (result)
-                        return result;
-        }
-        if (dev->flags.power_manageable) {
-                result = device_create_file(&dev->dev, &dev_attr_power_state);
-                if (result)
-                        return result;
-                if (dev->power.flags.power_resources)
-                        result = device_create_file(&dev->dev,
-                                                    &dev_attr_real_power_state);
-        }
-end:
-        return result;
-}
-static void acpi_device_remove_files(struct acpi_device *dev)
-{
-        if (dev->flags.power_manageable) {
-                device_remove_file(&dev->dev, &dev_attr_power_state);
-                if (dev->power.flags.power_resources)
-                        device_remove_file(&dev->dev,
-                                           &dev_attr_real_power_state);
-        }
-        /*
-         * If device has _STR, remove 'description' file
-         */
-        if (acpi_has_method(dev->handle, "_STR")) {
-                kfree(dev->pnp.str_obj);
-                device_remove_file(&dev->dev, &dev_attr_description);
-        }
-        /*
-         * If device has _EJ0, remove 'eject' file.
-         */
-        if (acpi_has_method(dev->handle, "_EJ0"))
-                device_remove_file(&dev->dev, &dev_attr_eject);
-        if (acpi_has_method(dev->handle, "_SUN"))
-                device_remove_file(&dev->dev, &dev_attr_sun);
-        if (dev->pnp.unique_id)
-                device_remove_file(&dev->dev, &dev_attr_uid);
-        if (dev->pnp.type.bus_address)
-                device_remove_file(&dev->dev, &dev_attr_adr);
-        device_remove_file(&dev->dev, &dev_attr_modalias);
-        device_remove_file(&dev->dev, &dev_attr_hid);
-        if (acpi_has_method(dev->handle, "_STA"))
-                device_remove_file(&dev->dev, &dev_attr_status);
-        if (dev->handle)
-                device_remove_file(&dev->dev, &dev_attr_path);
-}
-/* --------------------------------------------------------------------------
-                        ACPI Bus operations
-   -------------------------------------------------------------------------- */
-/**
- * acpi_of_match_device - Match device object using the "compatible" property.
- * @adev: ACPI device object to match.
- * @of_match_table: List of device IDs to match against.
- *
- * If @dev has an ACPI companion which has ACPI_DT_NAMESPACE_HID in its list of
- * identifiers and a _DSD object with the "compatible" property, use that
- * property to match against the given list of identifiers.
- */
-static bool acpi_of_match_device(struct acpi_device *adev,
-                                 const struct of_device_id *of_match_table)
-{
-        const union acpi_object *of_compatible, *obj;
-        int i, nval;
-        if (!adev)
-                return false;
-        of_compatible = adev->data.of_compatible;
-        if (!of_match_table || !of_compatible)
-                return false;
-        if (of_compatible->type == ACPI_TYPE_PACKAGE) {
-                nval = of_compatible->package.count;
-                obj = of_compatible->package.elements;
-        } else { /* Must be ACPI_TYPE_STRING. */
-                nval = 1;
-                obj = of_compatible;
-        }
-        /* Now we can look for the driver DT compatible strings */
-        for (i = 0; i < nval; i++, obj++) {
-                const struct of_device_id *id;
-                for (id = of_match_table; id->compatible[0]; id++)
-                        if (!strcasecmp(obj->string.pointer, id->compatible))
-                                return true;
-        }
-        return false;
-}
-static bool __acpi_match_device_cls(const struct acpi_device_id *id,
-                                    struct acpi_hardware_id *hwid)
-{
-        int i, msk, byte_shift;
-        char buf[3];
-        if (!id->cls)
-                return false;
-        /* Apply class-code bitmask, before checking each class-code byte */
-        for (i = 1; i <= 3; i++) {
-                byte_shift = 8 * (3 - i);
-                msk = (id->cls_msk >> byte_shift) & 0xFF;
-                if (!msk)
-                        continue;
-                sprintf(buf, "%02x", (id->cls >> byte_shift) & msk);
-                if (strncmp(buf, &hwid->id[(i - 1) * 2], 2))
-                        return false;
-        }
-        return true;
-}
-static const struct acpi_device_id *__acpi_match_device(
-        struct acpi_device *device,
-        const struct acpi_device_id *ids,
-        const struct of_device_id *of_ids)
-{
-        const struct acpi_device_id *id;
-        struct acpi_hardware_id *hwid;
-        /*
-         * If the device is not present, it is unnecessary to load device
-         * driver for it.
-         */
-        if (!device || !device->status.present)
-                return NULL;
-        list_for_each_entry(hwid, &device->pnp.ids, list) {
-                /* First, check the ACPI/PNP IDs provided by the caller. */
-                for (id = ids; id->id[0] || id->cls; id++) {
-                        if (id->id[0] && !strcmp((char *) id->id, hwid->id))
-                                return id;
-                        else if (id->cls && __acpi_match_device_cls(id, hwid))
-                                return id;
-                }
-                /*
-                 * Next, check ACPI_DT_NAMESPACE_HID and try to match the
-                 * "compatible" property if found.
-                 *
-                 * The id returned by the below is not valid, but the only
-                 * caller passing non-NULL of_ids here is only interested in
-                 * whether or not the return value is NULL.
-                 */
-                if (!strcmp(ACPI_DT_NAMESPACE_HID, hwid->id)
-                    && acpi_of_match_device(device, of_ids))
-                        return id;
-        }
-        return NULL;
-}
-/**
- * acpi_match_device - Match a struct device against a given list of ACPI IDs
- * @ids: Array of struct acpi_device_id object to match against.
- * @dev: The device structure to match.
- *
- * Check if @dev has a valid ACPI handle and if there is a struct acpi_device
- * object for that handle and use that object to match against a given list of
- * device IDs.
- *
- * Return a pointer to the first matching ID on success or %NULL on failure.
- */
-const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
-                                               const struct device *dev)
-{
-        return __acpi_match_device(acpi_companion_match(dev), ids, NULL);
-}
-EXPORT_SYMBOL_GPL(acpi_match_device);
-int acpi_match_device_ids(struct acpi_device *device,
-                          const struct acpi_device_id *ids)
-{
-        return __acpi_match_device(device, ids, NULL) ? 0 : -ENOENT;
-}
-EXPORT_SYMBOL(acpi_match_device_ids);
-bool acpi_driver_match_device(struct device *dev,
-                              const struct device_driver *drv)
-{
-        if (!drv->acpi_match_table)
-                return acpi_of_match_device(ACPI_COMPANION(dev),
-                                            drv->of_match_table);
-        return !!__acpi_match_device(acpi_companion_match(dev),
-                                     drv->acpi_match_table, drv->of_match_table);
-}
-EXPORT_SYMBOL_GPL(acpi_driver_match_device);
 static void acpi_free_power_resources_lists(struct acpi_device *device)
 {
        int i;
@@ -1144,144 +470,6 @@ static void acpi_device_release(struct device *dev)
        kfree(acpi_dev);
 }
-static int acpi_bus_match(struct device *dev, struct device_driver *drv)
-{
-        struct acpi_device *acpi_dev = to_acpi_device(dev);
-        struct acpi_driver *acpi_drv = to_acpi_driver(drv);
-        return acpi_dev->flags.match_driver
-                && !acpi_match_device_ids(acpi_dev, acpi_drv->ids);
-}
-static int acpi_device_uevent(struct device *dev, struct kobj_uevent_env *env)
-{
-        return __acpi_device_uevent_modalias(to_acpi_device(dev), env);
-}
-static void acpi_device_notify(acpi_handle handle, u32 event, void *data)
-{
-        struct acpi_device *device = data;
-        device->driver->ops.notify(device, event);
-}
-static void acpi_device_notify_fixed(void *data)
-{
-        struct acpi_device *device = data;
-        /* Fixed hardware devices have no handles */
-        acpi_device_notify(NULL, ACPI_FIXED_HARDWARE_EVENT, device);
-}
-static u32 acpi_device_fixed_event(void *data)
-{
-        acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_device_notify_fixed, data);
-        return ACPI_INTERRUPT_HANDLED;
-}
-static int acpi_device_install_notify_handler(struct acpi_device *device)
-{
-        acpi_status status;
-        if (device->device_type == ACPI_BUS_TYPE_POWER_BUTTON)
-                status =
-                    acpi_install_fixed_event_handler(ACPI_EVENT_POWER_BUTTON,
-                                                     acpi_device_fixed_event,
-                                                     device);
-        else if (device->device_type == ACPI_BUS_TYPE_SLEEP_BUTTON)
-                status =
-                    acpi_install_fixed_event_handler(ACPI_EVENT_SLEEP_BUTTON,
-                                                     acpi_device_fixed_event,
-                                                     device);
-        else
-                status = acpi_install_notify_handler(device->handle,
-                                                     ACPI_DEVICE_NOTIFY,
-                                                     acpi_device_notify,
-                                                     device);
-        if (ACPI_FAILURE(status))
-                return -EINVAL;
-        return 0;
-}
-static void acpi_device_remove_notify_handler(struct acpi_device *device)
-{
-        if (device->device_type == ACPI_BUS_TYPE_POWER_BUTTON)
-                acpi_remove_fixed_event_handler(ACPI_EVENT_POWER_BUTTON,
-                                                acpi_device_fixed_event);
-        else if (device->device_type == ACPI_BUS_TYPE_SLEEP_BUTTON)
-                acpi_remove_fixed_event_handler(ACPI_EVENT_SLEEP_BUTTON,
-                                                acpi_device_fixed_event);
-        else
-                acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY,
-                                           acpi_device_notify);
-}
-static int acpi_device_probe(struct device *dev)
-{
-        struct acpi_device *acpi_dev = to_acpi_device(dev);
-        struct acpi_driver *acpi_drv = to_acpi_driver(dev->driver);
-        int ret;
-        if (acpi_dev->handler && !acpi_is_pnp_device(acpi_dev))
-                return -EINVAL;
-        if (!acpi_drv->ops.add)
-                return -ENOSYS;
-        ret = acpi_drv->ops.add(acpi_dev);
-        if (ret)
-                return ret;
-        acpi_dev->driver = acpi_drv;
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                          "Driver [%s] successfully bound to device [%s]\n",
-                          acpi_drv->name, acpi_dev->pnp.bus_id));
-        if (acpi_drv->ops.notify) {
-                ret = acpi_device_install_notify_handler(acpi_dev);
-                if (ret) {
-                        if (acpi_drv->ops.remove)
-                                acpi_drv->ops.remove(acpi_dev);
-                        acpi_dev->driver = NULL;
-                        acpi_dev->driver_data = NULL;
-                        return ret;
-                }
-        }
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found driver [%s] for device [%s]\n",
-                          acpi_drv->name, acpi_dev->pnp.bus_id));
-        get_device(dev);
-        return 0;
-}
-static int acpi_device_remove(struct device * dev)
-{
-        struct acpi_device *acpi_dev = to_acpi_device(dev);
-        struct acpi_driver *acpi_drv = acpi_dev->driver;
-        if (acpi_drv) {
-                if (acpi_drv->ops.notify)
-                        acpi_device_remove_notify_handler(acpi_dev);
-                if (acpi_drv->ops.remove)
-                        acpi_drv->ops.remove(acpi_dev);
-        }
-        acpi_dev->driver = NULL;
-        acpi_dev->driver_data = NULL;
-        put_device(dev);
-        return 0;
-}
-struct bus_type acpi_bus_type = {
-        .name           = "acpi",
-        .match          = acpi_bus_match,
-        .probe          = acpi_device_probe,
-        .remove         = acpi_device_remove,
-        .uevent         = acpi_device_uevent,
-};
 static void acpi_device_del(struct acpi_device *device)
 {
        mutex_lock(&acpi_device_lock);
@@ -1529,47 +717,6 @@ struct acpi_device *acpi_get_next_child(struct device *dev,
 }
 /* --------------------------------------------------------------------------
-                                 Driver Management
-   -------------------------------------------------------------------------- */
-/**
- * acpi_bus_register_driver - register a driver with the ACPI bus
- * @driver: driver being registered
- *
- * Registers a driver with the ACPI bus.  Searches the namespace for all
- * devices that match the driver's criteria and binds.  Returns zero for
- * success or a negative error status for failure.
- */
-int acpi_bus_register_driver(struct acpi_driver *driver)
-{
-        int ret;
-        if (acpi_disabled)
-                return -ENODEV;
-        driver->drv.name = driver->name;
-        driver->drv.bus = &acpi_bus_type;
-        driver->drv.owner = driver->owner;
-        ret = driver_register(&driver->drv);
-        return ret;
-}
-EXPORT_SYMBOL(acpi_bus_register_driver);
-/**
- * acpi_bus_unregister_driver - unregisters a driver with the ACPI bus
- * @driver: driver to unregister
- *
- * Unregisters a driver with the ACPI bus.  Searches the namespace for all
- * devices that match the driver's criteria and unbinds.
- */
-void acpi_bus_unregister_driver(struct acpi_driver *driver)
-{
-        driver_unregister(&driver->drv);
-}
-EXPORT_SYMBOL(acpi_bus_unregister_driver);
-/* --------------------------------------------------------------------------
                                 Device Enumeration
   -------------------------------------------------------------------------- */
 static struct acpi_device *acpi_bus_get_parent(acpi_handle handle)
@@ -2744,12 +1891,6 @@ int __init acpi_scan_init(void)
 {
        int result;
-        result = bus_register(&acpi_bus_type);
-        if (result) {
-                /* We don't want to quit even if we failed to add suspend/resume */
-                printk(KERN_ERR PREFIX "Could not register bus type\n");
-        }
        acpi_pci_root_init();
        acpi_pci_link_init();
        acpi_processor_init();
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index 2e19189da0ee..17a6fa01a338 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -15,10 +15,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 *
 */
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 6d4e44ea74ac..fc28b9f5aa84 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -16,10 +16,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 *
 *  This driver fully implements the ACPI thermal policy as described in the
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 67c548ad3764..475c9079bf85 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -16,10 +16,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
diff --git a/drivers/mailbox/Kconfig b/drivers/mailbox/Kconfig
index e269f084497d..bbec5009cdc2 100644
--- a/drivers/mailbox/Kconfig
+++ b/drivers/mailbox/Kconfig
@@ -46,6 +46,7 @@ config OMAP_MBOX_KFIFO_SIZE
 config PCC
        bool "Platform Communication Channel Driver"
        depends on ACPI
+        default n
        help
          ACPI 5.0+ spec defines a generic mode of communication
          between the OS and a platform such as the BMC. This medium
diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c
index 26d121d1d501..68885a82e704 100644
--- a/drivers/mailbox/pcc.c
+++ b/drivers/mailbox/pcc.c
@@ -352,4 +352,10 @@ static int __init pcc_init(void)
        return 0;
 }
-device_initcall(pcc_init);
+/*
+ * Make PCC init postcore so that users of this mailbox
+ * such as the ACPI Processor driver have it available
+ * at their init.
+ */
+postcore_initcall(pcc_init);
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 83061cac719b..5ba8fb64f664 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -16,10 +16,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index ea6428b7dacb..29c691265b49 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -16,10 +16,6 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index 4188a4d3b597..2c4e7a9c1725 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -318,6 +318,7 @@ int acpi_get_cpuid(acpi_handle, int type, u32 acpi_id);
 void acpi_processor_set_pdc(acpi_handle handle);
 /* in processor_throttling.c */
+#ifdef CONFIG_ACPI_CPU_FREQ_PSS
 int acpi_processor_tstate_has_changed(struct acpi_processor *pr);
 int acpi_processor_get_throttling_info(struct acpi_processor *pr);
 extern int acpi_processor_set_throttling(struct acpi_processor *pr,
@@ -330,14 +331,59 @@ extern void acpi_processor_reevaluate_tstate(struct acpi_processor *pr,
                        unsigned long action);
 extern const struct file_operations acpi_processor_throttling_fops;
 extern void acpi_processor_throttling_init(void);
+#else
+static inline int acpi_processor_tstate_has_changed(struct acpi_processor *pr)
+{
+        return 0;
+}
+static inline int acpi_processor_get_throttling_info(struct acpi_processor *pr)
+{
+        return -ENODEV;
+}
+static inline int acpi_processor_set_throttling(struct acpi_processor *pr,
+                                         int state, bool force)
+{
+        return -ENODEV;
+}
+static inline void acpi_processor_reevaluate_tstate(struct acpi_processor *pr,
+                        unsigned long action) {}
+static inline void acpi_processor_throttling_init(void) {}
+#endif  /* CONFIG_ACPI_CPU_FREQ_PSS */
 /* in processor_idle.c */
+extern struct cpuidle_driver acpi_idle_driver;
+#ifdef CONFIG_ACPI_PROCESSOR_IDLE
 int acpi_processor_power_init(struct acpi_processor *pr);
 int acpi_processor_power_exit(struct acpi_processor *pr);
 int acpi_processor_cst_has_changed(struct acpi_processor *pr);
 int acpi_processor_hotplug(struct acpi_processor *pr);
-extern struct cpuidle_driver acpi_idle_driver;
+#else
+static inline int acpi_processor_power_init(struct acpi_processor *pr)
+{
+        return -ENODEV;
+}
-#ifdef CONFIG_PM_SLEEP
+static inline int acpi_processor_power_exit(struct acpi_processor *pr)
+{
+        return -ENODEV;
+}
+static inline int acpi_processor_cst_has_changed(struct acpi_processor *pr)
+{
+        return -ENODEV;
+}
+static inline int acpi_processor_hotplug(struct acpi_processor *pr)
+{
+        return -ENODEV;
+}
+#endif /* CONFIG_ACPI_PROCESSOR_IDLE */
+#if defined(CONFIG_PM_SLEEP) & defined(CONFIG_ACPI_PROCESSOR_IDLE)
 void acpi_processor_syscore_init(void);
 void acpi_processor_syscore_exit(void);
 #else
@@ -348,7 +394,7 @@ static inline void acpi_processor_syscore_exit(void) {}
 /* in processor_thermal.c */
 int acpi_processor_get_limit_info(struct acpi_processor *pr);
 extern const struct thermal_cooling_device_ops processor_cooling_ops;
-#ifdef CONFIG_CPU_FREQ
+#if defined(CONFIG_ACPI_CPU_FREQ_PSS) & defined(CONFIG_CPU_FREQ)
 void acpi_thermal_cpufreq_init(void);
 void acpi_thermal_cpufreq_exit(void);
 #else
@@ -360,6 +406,6 @@ static inline void acpi_thermal_cpufreq_exit(void)
 {
        return;
 }
-#endif
+#endif  /* CONFIG_ACPI_CPU_FREQ_PSS */
 #endif
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index d2445fa9999f..01e6770d8e27 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -15,10 +15,6 @@
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */