5 files changed, 7 insertions, 161 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index fbcaa069be86..b4f5e8542829 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -300,17 +300,6 @@ config ACPI_CUSTOM_DSDT
         bool
         default ACPI_CUSTOM_DSDT_FILE != ""
 
-config ACPI_CUSTOM_DSDT_INITRD
-        bool "Read Custom DSDT from initramfs"
-        depends on BLK_DEV_INITRD
-        default n
-        help
-          This option supports a custom DSDT by optionally loading it from initrd.
-          See Documentation/acpi/dsdt-override.txt
-
-          If you are not using this feature now, but may use it later,
-          it is safe to say Y here.
-
 config ACPI_BLACKLIST_YEAR
         int "Disable ACPI for systems before Jan 1st this year" if X86_32
         default 0
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index d25ef961415c..44ad90c03c2e 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -610,7 +610,7 @@ write_led(const char __user * buffer, unsigned long count,
             (led_out) ? (hotk->status | ledmask) : (hotk->status & ~ledmask);
 
         if (invert)             /* invert target value */
-                led_out = !led_out & 0x1;
+                led_out = !led_out;
 
         if (!write_acpi_int(hotk->handle, ledname, led_out, NULL))
                 printk(KERN_WARNING "Asus ACPI: LED (%s) write failed\n",
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index f6215e809808..d5729d5dc190 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -293,13 +293,12 @@ static int extract_package(struct acpi_battery *battery,
                                 strncpy(ptr, (u8 *)&element->integer.value,
                                         sizeof(acpi_integer));
                                 ptr[sizeof(acpi_integer)] = 0;
-                        } else return -EFAULT;
+                        } else
+                                *ptr = 0; /* don't have value */
                 } else {
-                        if (element->type == ACPI_TYPE_INTEGER) {
-                                int *x = (int *)((u8 *)battery +
-                                                offsets[i].offset);
-                                *x = element->integer.value;
-                        } else return -EFAULT;
+                        int *x = (int *)((u8 *)battery + offsets[i].offset);
+                        *x = (element->type == ACPI_TYPE_INTEGER) ?
+                                element->integer.value : -1;
                 }
         }
         return 0;
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 065819ba87c7..a697fb6cf050 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -91,10 +91,6 @@ static DEFINE_SPINLOCK(acpi_res_lock);
 #define OSI_STRING_LENGTH_MAX 64        /* arbitrary */
 static char osi_additional_string[OSI_STRING_LENGTH_MAX];
 
-#ifdef CONFIG_ACPI_CUSTOM_DSDT_INITRD
-static int acpi_no_initrd_override;
-#endif
-
 /*
  * "Ode to _OSI(Linux)"
  *
@@ -324,67 +320,6 @@ acpi_os_predefined_override(const struct acpi_predefined_names *init_val,
         return AE_OK;
 }
 
-#ifdef CONFIG_ACPI_CUSTOM_DSDT_INITRD
-static struct acpi_table_header *acpi_find_dsdt_initrd(void)
-{
-        struct file *firmware_file;
-        mm_segment_t oldfs;
-        unsigned long len, len2;
-        struct acpi_table_header *dsdt_buffer, *ret = NULL;
-        struct kstat stat;
-        char *ramfs_dsdt_name = "/DSDT.aml";
-
-        printk(KERN_INFO PREFIX "Checking initramfs for custom DSDT\n");
-
-        /*
-         * Never do this at home, only the user-space is allowed to open a file.
-         * The clean way would be to use the firmware loader.
-         * But this code must be run before there is any userspace available.
-         * A static/init firmware infrastructure doesn't exist yet...
-         */
-        if (vfs_stat(ramfs_dsdt_name, &stat) < 0)
-                return ret;
-
-        len = stat.size;
-        /* check especially against empty files */
-        if (len <= 4) {
-                printk(KERN_ERR PREFIX "Failed: DSDT only %lu bytes.\n", len);
-                return ret;
-        }
-
-        firmware_file = filp_open(ramfs_dsdt_name, O_RDONLY, 0);
-        if (IS_ERR(firmware_file)) {
-                printk(KERN_ERR PREFIX "Failed to open %s.\n", ramfs_dsdt_name);
-                return ret;
-        }
-
-        dsdt_buffer = kmalloc(len, GFP_ATOMIC);
-        if (!dsdt_buffer) {
-                printk(KERN_ERR PREFIX "Failed to allocate %lu bytes.\n", len);
-                goto err;
-        }
-
-        oldfs = get_fs();
-        set_fs(KERNEL_DS);
-        len2 = vfs_read(firmware_file, (char __user *)dsdt_buffer, len,
-                &firmware_file->f_pos);
-        set_fs(oldfs);
-        if (len2 < len) {
-                printk(KERN_ERR PREFIX "Failed to read %lu bytes from %s.\n",
-                        len, ramfs_dsdt_name);
-                ACPI_FREE(dsdt_buffer);
-                goto err;
-        }
-
-        printk(KERN_INFO PREFIX "Found %lu byte DSDT in %s.\n",
-                        len, ramfs_dsdt_name);
-        ret = dsdt_buffer;
-err:
-        filp_close(firmware_file, NULL);
-        return ret;
-}
-#endif
-
 acpi_status
 acpi_os_table_override(struct acpi_table_header * existing_table,
                        struct acpi_table_header ** new_table)
@@ -398,16 +333,6 @@ acpi_os_table_override(struct acpi_table_header * existing_table,
         if (strncmp(existing_table->signature, "DSDT", 4) == 0)
                 *new_table = (struct acpi_table_header *)AmlCode;
 #endif
-#ifdef CONFIG_ACPI_CUSTOM_DSDT_INITRD
-        if ((strncmp(existing_table->signature, "DSDT", 4) == 0) &&
-            !acpi_no_initrd_override) {
-                struct acpi_table_header *initrd_table;
-
-                initrd_table = acpi_find_dsdt_initrd();
-                if (initrd_table)
-                        *new_table = initrd_table;
-        }
-#endif
         if (*new_table != NULL) {
                 printk(KERN_WARNING PREFIX "Override [%4.4s-%8.8s], "
                            "this is unsafe: tainting kernel\n",
@@ -418,15 +343,6 @@ acpi_os_table_override(struct acpi_table_header * existing_table,
         return AE_OK;
 }
 
-#ifdef CONFIG_ACPI_CUSTOM_DSDT_INITRD
-static int __init acpi_no_initrd_override_setup(char *s)
-{
-        acpi_no_initrd_override = 1;
-        return 1;
-}
-__setup("acpi_no_initrd_override", acpi_no_initrd_override_setup);
-#endif
-
 static irqreturn_t acpi_irq(int irq, void *dev_id)
 {
         u32 handled;
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 1bc0c74f2755..12fb44f16766 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -807,40 +807,11 @@ static void acpi_video_bus_find_cap(struct acpi_video_bus *video)
 static int acpi_video_bus_check(struct acpi_video_bus *video)
 {
         acpi_status status = -ENOENT;
-        long device_id;
-        struct device *dev;
-        struct acpi_device *device;
+
 
         if (!video)
                 return -EINVAL;
 
-        device = video->device;
-
-        status =
-            acpi_evaluate_integer(device->handle, "_ADR", NULL, &device_id);
-
-        if (!ACPI_SUCCESS(status))
-                return -ENODEV;
-
-        /* We need to attempt to determine whether the _ADR refers to a
-           PCI device or not. There's no terribly good way to do this,
-           so the best we can hope for is to assume that there'll never
-           be a video device in the host bridge */
-        if (device_id >= 0x10000) {
-                /* It looks like a PCI device. Does it exist? */
-                dev = acpi_get_physical_device(device->handle);
-        } else {
-                /* It doesn't look like a PCI device. Does its parent
-                   exist? */
-                acpi_handle phandle;
-                if (acpi_get_parent(device->handle, &phandle))
-                        return -ENODEV;
-                dev = acpi_get_physical_device(phandle);
-        }
-        if (!dev)
-                return -ENODEV;
-        put_device(dev);
-
         /* Since there is no HID, CID and so on for VGA driver, we have
          * to check well known required nodes.
          */
@@ -1366,37 +1337,8 @@ acpi_video_bus_write_DOS(struct file *file,
 
 static int acpi_video_bus_add_fs(struct acpi_device *device)
 {
-        long device_id;
-        int status;
         struct proc_dir_entry *entry = NULL;
         struct acpi_video_bus *video;
-        struct device *dev;
-
-        status =
-            acpi_evaluate_integer(device->handle, "_ADR", NULL, &device_id);
-
-        if (!ACPI_SUCCESS(status))
-                return -ENODEV;
-
-        /* We need to attempt to determine whether the _ADR refers to a
-           PCI device or not. There's no terribly good way to do this,
-           so the best we can hope for is to assume that there'll never
-           be a video device in the host bridge */
-        if (device_id >= 0x10000) {
-                /* It looks like a PCI device. Does it exist? */
-                dev = acpi_get_physical_device(device->handle);
-        } else {
-                /* It doesn't look like a PCI device. Does its parent
-                   exist? */
-                acpi_handle phandle;
-                if (acpi_get_parent(device->handle, &phandle))
-                        return -ENODEV;
-                dev = acpi_get_physical_device(phandle);
-        }
-        if (!dev)
-                return -ENODEV;
-        put_device(dev);
-
 
 
         video = acpi_driver_data(device);