3 files changed, 56 insertions, 82 deletions

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 2c790b5badb3..baef28c1e630 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -234,10 +234,8 @@ static int ec_poll(struct acpi_ec *ec)
                         }
                         advance_transaction(ec, acpi_ec_read_status(ec));
                 } while (time_before(jiffies, delay));
-                if (!ec->curr->irq_count ||
-                    (acpi_ec_read_status(ec) & ACPI_EC_FLAG_IBF))
+                if (acpi_ec_read_status(ec) & ACPI_EC_FLAG_IBF)
                         break;
-                /* try restart command if we get any false interrupts */
                 pr_debug(PREFIX "controller reset, restart transaction\n");
                 spin_lock_irqsave(&ec->curr_lock, flags);
                 start_transaction(ec);
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 468921bed22f..14a7481c97d7 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1052,6 +1052,8 @@ static void acpi_device_set_id(struct acpi_device *device)
                         device->flags.bus_address = 1;
                 }
 
+                kfree(info);
+
                 /*
                  * Some devices don't reliably have _HIDs & _CIDs, so add
                  * synthetic HIDs to make sure drivers can find them.
@@ -1325,13 +1327,8 @@ static int acpi_bus_scan(acpi_handle handle, struct acpi_bus_ops *ops,
                          struct acpi_device **child)
 {
         acpi_status status;
-        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
         void *device = NULL;
 
-        acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
-        printk(KERN_INFO PREFIX "Enumerating devices from [%s]\n",
-               (char *) buffer.pointer);
-
         status = acpi_bus_check_add(handle, 0, ops, &device);
         if (ACPI_SUCCESS(status))
                 acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX,
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index afdbdaaf80cb..a2a742c8ff7e 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -1211,15 +1211,6 @@ static int sony_nc_add(struct acpi_device *device)
                 }
         }
 
-        /* try to _INI the device if such method exists (ACPI spec 3.0-6.5.1
-         * should be respected as we already checked for the device presence above */
-        if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, METHOD_NAME__INI, &handle))) {
-                dprintk("Invoking _INI\n");
-                if (ACPI_FAILURE(acpi_evaluate_object(sony_nc_acpi_handle, METHOD_NAME__INI,
-                                                NULL, NULL)))
-                        dprintk("_INI Method failed\n");
-        }
-
         if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "ECON",
                                          &handle))) {
                 if (acpi_callsetfunc(sony_nc_acpi_handle, "ECON", 1, NULL))
@@ -1399,27 +1390,20 @@ struct sonypi_eventtypes {
         struct sonypi_event     *events;
 };
 
-struct device_ctrl {
+struct sony_pic_dev {
+        struct acpi_device              *acpi_dev;
+        struct sony_pic_irq             *cur_irq;
+        struct sony_pic_ioport          *cur_ioport;
+        struct list_head                interrupts;
+        struct list_head                ioports;
+        struct mutex                    lock;
+        struct sonypi_eventtypes        *event_types;
+        int                             (*handle_irq)(const u8, const u8);
         int                             model;
-        int                             (*handle_irq)(const u8, const u8);
         u16                             evport_offset;
-        u8                              has_camera;
-        u8                              has_bluetooth;
-        u8                              has_wwan;
-        struct sonypi_eventtypes        *event_types;
-};
-
-struct sony_pic_dev {
-        struct device_ctrl      *control;
-        struct acpi_device      *acpi_dev;
-        struct sony_pic_irq     *cur_irq;
-        struct sony_pic_ioport  *cur_ioport;
-        struct list_head        interrupts;
-        struct list_head        ioports;
-        struct mutex            lock;
-        u8                      camera_power;
-        u8                      bluetooth_power;
-        u8                      wwan_power;
+        u8                              camera_power;
+        u8                              bluetooth_power;
+        u8                              wwan_power;
 };
 
 static struct sony_pic_dev spic_dev = {
@@ -1427,6 +1411,8 @@ static struct sony_pic_dev spic_dev = {
         .ioports        = LIST_HEAD_INIT(spic_dev.ioports),
 };
 
+static int spic_drv_registered;
+
 /* Event masks */
 #define SONYPI_JOGGER_MASK                      0x00000001
 #define SONYPI_CAPTURE_MASK                     0x00000002
@@ -1724,27 +1710,6 @@ static int type3_handle_irq(const u8 data_mask, const u8 ev)
         return 1;
 }
 
-static struct device_ctrl spic_types[] = {
-        {
-                .model = SONYPI_DEVICE_TYPE1,
-                .handle_irq = NULL,
-                .evport_offset = SONYPI_TYPE1_OFFSET,
-                .event_types = type1_events,
-        },
-        {
-                .model = SONYPI_DEVICE_TYPE2,
-                .handle_irq = NULL,
-                .evport_offset = SONYPI_TYPE2_OFFSET,
-                .event_types = type2_events,
-        },
-        {
-                .model = SONYPI_DEVICE_TYPE3,
-                .handle_irq = type3_handle_irq,
-                .evport_offset = SONYPI_TYPE3_OFFSET,
-                .event_types = type3_events,
-        },
-};
-
 static void sony_pic_detect_device_type(struct sony_pic_dev *dev)
 {
         struct pci_dev *pcidev;
@@ -1752,48 +1717,63 @@ static void sony_pic_detect_device_type(struct sony_pic_dev *dev)
         pcidev = pci_get_device(PCI_VENDOR_ID_INTEL,
                         PCI_DEVICE_ID_INTEL_82371AB_3, NULL);
         if (pcidev) {
-                dev->control = &spic_types[0];
+                dev->model = SONYPI_DEVICE_TYPE1;
+                dev->evport_offset = SONYPI_TYPE1_OFFSET;
+                dev->event_types = type1_events;
                 goto out;
         }
 
         pcidev = pci_get_device(PCI_VENDOR_ID_INTEL,
                         PCI_DEVICE_ID_INTEL_ICH6_1, NULL);
         if (pcidev) {
-                dev->control = &spic_types[2];
+                dev->model = SONYPI_DEVICE_TYPE2;
+                dev->evport_offset = SONYPI_TYPE2_OFFSET;
+                dev->event_types = type2_events;
                 goto out;
         }
 
         pcidev = pci_get_device(PCI_VENDOR_ID_INTEL,
                         PCI_DEVICE_ID_INTEL_ICH7_1, NULL);
         if (pcidev) {
-                dev->control = &spic_types[2];
+                dev->model = SONYPI_DEVICE_TYPE3;
+                dev->handle_irq = type3_handle_irq;
+                dev->evport_offset = SONYPI_TYPE3_OFFSET;
+                dev->event_types = type3_events;
                 goto out;
         }
 
         pcidev = pci_get_device(PCI_VENDOR_ID_INTEL,
                         PCI_DEVICE_ID_INTEL_ICH8_4, NULL);
         if (pcidev) {
-                dev->control = &spic_types[2];
+                dev->model = SONYPI_DEVICE_TYPE3;
+                dev->handle_irq = type3_handle_irq;
+                dev->evport_offset = SONYPI_TYPE3_OFFSET;
+                dev->event_types = type3_events;
                 goto out;
         }
 
         pcidev = pci_get_device(PCI_VENDOR_ID_INTEL,
                         PCI_DEVICE_ID_INTEL_ICH9_1, NULL);
         if (pcidev) {
-                dev->control = &spic_types[2];
+                dev->model = SONYPI_DEVICE_TYPE3;
+                dev->handle_irq = type3_handle_irq;
+                dev->evport_offset = SONYPI_TYPE3_OFFSET;
+                dev->event_types = type3_events;
                 goto out;
         }
 
         /* default */
-        dev->control = &spic_types[1];
+        dev->model = SONYPI_DEVICE_TYPE2;
+        dev->evport_offset = SONYPI_TYPE2_OFFSET;
+        dev->event_types = type2_events;
 
 out:
         if (pcidev)
                 pci_dev_put(pcidev);
 
         printk(KERN_INFO DRV_PFX "detected Type%d model\n",
-                        dev->control->model == SONYPI_DEVICE_TYPE1 ? 1 :
-                        dev->control->model == SONYPI_DEVICE_TYPE2 ? 2 : 3);
+                        dev->model == SONYPI_DEVICE_TYPE1 ? 1 :
+                        dev->model == SONYPI_DEVICE_TYPE2 ? 2 : 3);
 }
 
 /* camera tests and poweron/poweroff */
@@ -2566,7 +2546,7 @@ static int sony_pic_enable(struct acpi_device *device,
         buffer.pointer = resource;
 
         /* setup Type 1 resources */
-        if (spic_dev.control->model == SONYPI_DEVICE_TYPE1) {
+        if (spic_dev.model == SONYPI_DEVICE_TYPE1) {
 
                 /* setup io resources */
                 resource->res1.type = ACPI_RESOURCE_TYPE_IO;
@@ -2649,29 +2629,28 @@ static irqreturn_t sony_pic_irq(int irq, void *dev_id)
                 data_mask = inb_p(dev->cur_ioport->io2.minimum);
         else
                 data_mask = inb_p(dev->cur_ioport->io1.minimum +
-                                dev->control->evport_offset);
+                                dev->evport_offset);
 
         dprintk("event ([%.2x] [%.2x]) at port 0x%.4x(+0x%.2x)\n",
                         ev, data_mask, dev->cur_ioport->io1.minimum,
-                        dev->control->evport_offset);
+                        dev->evport_offset);
 
         if (ev == 0x00 || ev == 0xff)
                 return IRQ_HANDLED;
 
-        for (i = 0; dev->control->event_types[i].mask; i++) {
+        for (i = 0; dev->event_types[i].mask; i++) {
 
-                if ((data_mask & dev->control->event_types[i].data) !=
-                    dev->control->event_types[i].data)
+                if ((data_mask & dev->event_types[i].data) !=
+                    dev->event_types[i].data)
                         continue;
 
-                if (!(mask & dev->control->event_types[i].mask))
+                if (!(mask & dev->event_types[i].mask))
                         continue;
 
-                for (j = 0; dev->control->event_types[i].events[j].event; j++) {
-                        if (ev == dev->control->event_types[i].events[j].data) {
+                for (j = 0; dev->event_types[i].events[j].event; j++) {
+                        if (ev == dev->event_types[i].events[j].data) {
                                 device_event =
-                                        dev->control->
-                                                event_types[i].events[j].event;
+                                        dev->event_types[i].events[j].event;
                                 goto found;
                         }
                 }
@@ -2679,13 +2658,12 @@ static irqreturn_t sony_pic_irq(int irq, void *dev_id)
         /* Still not able to decode the event try to pass
          * it over to the minidriver
          */
-        if (dev->control->handle_irq &&
-                        dev->control->handle_irq(data_mask, ev) == 0)
+        if (dev->handle_irq && dev->handle_irq(data_mask, ev) == 0)
                 return IRQ_HANDLED;
 
         dprintk("unknown event ([%.2x] [%.2x]) at port 0x%.4x(+0x%.2x)\n",
                         ev, data_mask, dev->cur_ioport->io1.minimum,
-                        dev->control->evport_offset);
+                        dev->evport_offset);
         return IRQ_HANDLED;
 
 found:
@@ -2816,7 +2794,7 @@ static int sony_pic_add(struct acpi_device *device)
         /* request IRQ */
         list_for_each_entry_reverse(irq, &spic_dev.interrupts, list) {
                 if (!request_irq(irq->irq.interrupts[0], sony_pic_irq,
-                                        IRQF_SHARED, "sony-laptop", &spic_dev)) {
+                                        IRQF_DISABLED, "sony-laptop", &spic_dev)) {
                         dprintk("IRQ: %d - triggering: %d - "
                                         "polarity: %d - shr: %d\n",
                                         irq->irq.interrupts[0],
@@ -2949,6 +2927,7 @@ static int __init sony_laptop_init(void)
                                         "Unable to register SPIC driver.");
                         goto out;
                 }
+                spic_drv_registered = 1;
         }
 
         result = acpi_bus_register_driver(&sony_nc_driver);
@@ -2960,7 +2939,7 @@ static int __init sony_laptop_init(void)
         return 0;
 
 out_unregister_pic:
-        if (!no_spic)
+        if (spic_drv_registered)
                 acpi_bus_unregister_driver(&sony_pic_driver);
 out:
         return result;
@@ -2969,7 +2948,7 @@ out:
 static void __exit sony_laptop_exit(void)
 {
         acpi_bus_unregister_driver(&sony_nc_driver);
-        if (!no_spic)
+        if (spic_drv_registered)
                 acpi_bus_unregister_driver(&sony_pic_driver);
 }