ACPICA: Add more conversions to predefined name repair module
[safe/jmp/linux-2.6] / drivers / acpi / dock.c
index 25d2161..30be3c1 100644 (file)
@@ -33,6 +33,8 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#define PREFIX "ACPI: "
+
 #define ACPI_DOCK_DRIVER_DESCRIPTION "ACPI Dock Station Driver"
 
 ACPI_MODULE_NAME("dock");
@@ -48,7 +50,6 @@ MODULE_PARM_DESC(immediate_undock, "1 (default) will cause the driver to "
        " before undocking");
 
 static struct atomic_notifier_head dock_notifier_list;
-static struct platform_device *dock_device;
 static char dock_device_name[] = "dock";
 
 static const struct acpi_device_id dock_device_ids[] = {
@@ -65,23 +66,29 @@ struct dock_station {
        struct mutex hp_lock;
        struct list_head dependent_devices;
        struct list_head hotplug_devices;
+
+       struct list_head sibling;
+       struct platform_device *dock_device;
 };
+static LIST_HEAD(dock_stations);
+static int dock_station_count;
 
 struct dock_dependent_device {
        struct list_head list;
        struct list_head hotplug_list;
        acpi_handle handle;
-       acpi_notify_handler handler;
+       struct acpi_dock_ops *ops;
        void *context;
 };
 
 #define DOCK_DOCKING   0x00000001
 #define DOCK_UNDOCKING  0x00000002
+#define DOCK_IS_DOCK   0x00000010
+#define DOCK_IS_ATA    0x00000020
+#define DOCK_IS_BAT    0x00000040
 #define DOCK_EVENT     3
 #define UNDOCK_EVENT   2
 
-static struct dock_station *dock_station;
-
 /*****************************************************************************
  *                         Dock Dependent device functions                   *
  *****************************************************************************/
@@ -199,6 +206,58 @@ static int is_dock(acpi_handle handle)
        return 1;
 }
 
+static int is_ejectable(acpi_handle handle)
+{
+       acpi_status status;
+       acpi_handle tmp;
+
+       status = acpi_get_handle(handle, "_EJ0", &tmp);
+       if (ACPI_FAILURE(status))
+               return 0;
+       return 1;
+}
+
+static int is_ata(acpi_handle handle)
+{
+       acpi_handle tmp;
+
+       if ((ACPI_SUCCESS(acpi_get_handle(handle, "_GTF", &tmp))) ||
+          (ACPI_SUCCESS(acpi_get_handle(handle, "_GTM", &tmp))) ||
+          (ACPI_SUCCESS(acpi_get_handle(handle, "_STM", &tmp))) ||
+          (ACPI_SUCCESS(acpi_get_handle(handle, "_SDD", &tmp))))
+               return 1;
+
+       return 0;
+}
+
+static int is_battery(acpi_handle handle)
+{
+       struct acpi_device_info *info;
+       int ret = 1;
+
+       if (!ACPI_SUCCESS(acpi_get_object_info(handle, &info)))
+               return 0;
+       if (!(info->valid & ACPI_VALID_HID))
+               ret = 0;
+       else
+               ret = !strcmp("PNP0C0A", info->hardware_id.string);
+
+       kfree(info);
+       return ret;
+}
+
+static int is_ejectable_bay(acpi_handle handle)
+{
+       acpi_handle phandle;
+       if (!is_ejectable(handle))
+               return 0;
+       if (is_battery(handle) || is_ata(handle))
+               return 1;
+       if (!acpi_get_parent(handle, &phandle) && is_ata(phandle))
+               return 1;
+       return 0;
+}
+
 /**
  * is_dock_device - see if a device is on a dock station
  * @handle: acpi handle of the device
@@ -209,11 +268,17 @@ static int is_dock(acpi_handle handle)
  */
 int is_dock_device(acpi_handle handle)
 {
-       if (!dock_station)
+       struct dock_station *dock_station;
+
+       if (!dock_station_count)
                return 0;
 
-       if (is_dock(handle) || find_dock_dependent_device(dock_station, handle))
+       if (is_dock(handle))
                return 1;
+       list_for_each_entry(dock_station, &dock_stations, sibling) {
+               if (find_dock_dependent_device(dock_station, handle))
+                       return 1;
+       }
 
        return 0;
 }
@@ -229,7 +294,7 @@ EXPORT_SYMBOL_GPL(is_dock_device);
  */
 static int dock_present(struct dock_station *ds)
 {
-       unsigned long sta;
+       unsigned long long sta;
        acpi_status status;
 
        if (ds) {
@@ -320,8 +385,8 @@ static void hotplug_dock_devices(struct dock_station *ds, u32 event)
         * First call driver specific hotplug functions
         */
        list_for_each_entry(dd, &ds->hotplug_devices, hotplug_list) {
-               if (dd->handler)
-                       dd->handler(dd->handle, event, dd->context);
+               if (dd->ops && dd->ops->handler)
+                       dd->ops->handler(dd->handle, event, dd->context);
        }
 
        /*
@@ -341,9 +406,10 @@ static void hotplug_dock_devices(struct dock_station *ds, u32 event)
 
 static void dock_event(struct dock_station *ds, u32 event, int num)
 {
-       struct device *dev = &dock_device->dev;
+       struct device *dev = &ds->dock_device->dev;
        char event_string[13];
        char *envp[] = { event_string, NULL };
+       struct dock_dependent_device *dd;
 
        if (num == UNDOCK_EVENT)
                sprintf(event_string, "EVENT=undock");
@@ -354,7 +420,14 @@ static void dock_event(struct dock_station *ds, u32 event, int num)
         * Indicate that the status of the dock station has
         * changed.
         */
-       kobject_uevent_env(&dev->kobj, KOBJ_CHANGE, envp);
+       if (num == DOCK_EVENT)
+               kobject_uevent_env(&dev->kobj, KOBJ_CHANGE, envp);
+
+       list_for_each_entry(dd, &ds->hotplug_devices, hotplug_list)
+               if (dd->ops && dd->ops->uevent)
+                       dd->ops->uevent(dd->handle, event, dd->context);
+       if (num != DOCK_EVENT)
+               kobject_uevent_env(&dev->kobj, KOBJ_CHANGE, envp);
 }
 
 /**
@@ -414,9 +487,10 @@ static void handle_dock(struct dock_station *ds, int dock)
        arg.type = ACPI_TYPE_INTEGER;
        arg.integer.value = dock;
        status = acpi_evaluate_object(ds->handle, "_DCK", &arg_list, &buffer);
-       if (ACPI_FAILURE(status))
-               printk(KERN_ERR PREFIX "%s - failed to execute _DCK\n",
-                        (char *)name_buffer.pointer);
+       if (ACPI_FAILURE(status) && status != AE_NOT_FOUND)
+               ACPI_EXCEPTION((AE_INFO, status, "%s - failed to execute"
+                       " _DCK\n", (char *)name_buffer.pointer));
+
        kfree(buffer.pointer);
        kfree(name_buffer.pointer);
 }
@@ -452,6 +526,25 @@ static inline void complete_undock(struct dock_station *ds)
        ds->flags &= ~(DOCK_UNDOCKING);
 }
 
+static void dock_lock(struct dock_station *ds, int lock)
+{
+       struct acpi_object_list arg_list;
+       union acpi_object arg;
+       acpi_status status;
+
+       arg_list.count = 1;
+       arg_list.pointer = &arg;
+       arg.type = ACPI_TYPE_INTEGER;
+       arg.integer.value = !!lock;
+       status = acpi_evaluate_object(ds->handle, "_LCK", &arg_list, NULL);
+       if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
+               if (lock)
+                       printk(KERN_WARNING PREFIX "Locking device failed\n");
+               else
+                       printk(KERN_WARNING PREFIX "Unlocking device failed\n");
+       }
+}
+
 /**
  * dock_in_progress - see if we are in the middle of handling a dock event
  * @ds: the dock station
@@ -479,7 +572,7 @@ static int dock_in_progress(struct dock_station *ds)
  */
 int register_dock_notifier(struct notifier_block *nb)
 {
-       if (!dock_station)
+       if (!dock_station_count)
                return -ENODEV;
 
        return atomic_notifier_chain_register(&dock_notifier_list, nb);
@@ -493,7 +586,7 @@ EXPORT_SYMBOL_GPL(register_dock_notifier);
  */
 void unregister_dock_notifier(struct notifier_block *nb)
 {
-       if (!dock_station)
+       if (!dock_station_count)
                return;
 
        atomic_notifier_chain_unregister(&dock_notifier_list, nb);
@@ -504,7 +597,7 @@ EXPORT_SYMBOL_GPL(unregister_dock_notifier);
 /**
  * register_hotplug_dock_device - register a hotplug function
  * @handle: the handle of the device
- * @handler: the acpi_notifier_handler to call after docking
+ * @ops: handlers to call after docking
  * @context: device specific data
  *
  * If a driver would like to perform a hotplug operation after a dock
@@ -512,27 +605,36 @@ EXPORT_SYMBOL_GPL(unregister_dock_notifier);
  * the dock driver after _DCK is executed.
  */
 int
-register_hotplug_dock_device(acpi_handle handle, acpi_notify_handler handler,
+register_hotplug_dock_device(acpi_handle handle, struct acpi_dock_ops *ops,
                             void *context)
 {
        struct dock_dependent_device *dd;
+       struct dock_station *dock_station;
+       int ret = -EINVAL;
 
-       if (!dock_station)
+       if (!dock_station_count)
                return -ENODEV;
 
        /*
         * make sure this handle is for a device dependent on the dock,
         * this would include the dock station itself
         */
-       dd = find_dock_dependent_device(dock_station, handle);
-       if (dd) {
-               dd->handler = handler;
-               dd->context = context;
-               dock_add_hotplug_device(dock_station, dd);
-               return 0;
+       list_for_each_entry(dock_station, &dock_stations, sibling) {
+               /*
+                * An ATA bay can be in a dock and itself can be ejected
+                * seperately, so there are two 'dock stations' which need the
+                * ops
+                */
+               dd = find_dock_dependent_device(dock_station, handle);
+               if (dd) {
+                       dd->ops = ops;
+                       dd->context = context;
+                       dock_add_hotplug_device(dock_station, dd);
+                       ret = 0;
+               }
        }
 
-       return -EINVAL;
+       return ret;
 }
 
 EXPORT_SYMBOL_GPL(register_hotplug_dock_device);
@@ -544,13 +646,16 @@ EXPORT_SYMBOL_GPL(register_hotplug_dock_device);
 void unregister_hotplug_dock_device(acpi_handle handle)
 {
        struct dock_dependent_device *dd;
+       struct dock_station *dock_station;
 
-       if (!dock_station)
+       if (!dock_station_count)
                return;
 
-       dd = find_dock_dependent_device(dock_station, handle);
-       if (dd)
-               dock_del_hotplug_device(dock_station, dd);
+       list_for_each_entry(dock_station, &dock_stations, sibling) {
+               dd = find_dock_dependent_device(dock_station, handle);
+               if (dd)
+                       dock_del_hotplug_device(dock_station, dd);
+       }
 }
 
 EXPORT_SYMBOL_GPL(unregister_hotplug_dock_device);
@@ -575,13 +680,9 @@ static int handle_eject_request(struct dock_station *ds, u32 event)
         */
        dock_event(ds, event, UNDOCK_EVENT);
 
-       if (!dock_present(ds)) {
-               complete_undock(ds);
-               return -ENODEV;
-       }
-
        hotplug_dock_devices(ds, ACPI_NOTIFY_EJECT_REQUEST);
        undock(ds);
+       dock_lock(ds, 0);
        eject_dock(ds);
        if (dock_present(ds)) {
                printk(KERN_ERR PREFIX "Unable to undock!\n");
@@ -605,9 +706,28 @@ static void dock_notify(acpi_handle handle, u32 event, void *data)
 {
        struct dock_station *ds = data;
        struct acpi_device *tmp;
+       int surprise_removal = 0;
+
+       /*
+        * According to acpi spec 3.0a, if a DEVICE_CHECK notification
+        * is sent and _DCK is present, it is assumed to mean an undock
+        * request.
+        */
+       if ((ds->flags & DOCK_IS_DOCK) && event == ACPI_NOTIFY_DEVICE_CHECK)
+               event = ACPI_NOTIFY_EJECT_REQUEST;
 
+       /*
+        * dock station: BUS_CHECK - docked or surprise removal
+        *               DEVICE_CHECK - undocked
+        * other device: BUS_CHECK/DEVICE_CHECK - added or surprise removal
+        *
+        * To simplify event handling, dock dependent device handler always
+        * get ACPI_NOTIFY_BUS_CHECK/ACPI_NOTIFY_DEVICE_CHECK for add and
+        * ACPI_NOTIFY_EJECT_REQUEST for removal
+        */
        switch (event) {
        case ACPI_NOTIFY_BUS_CHECK:
+       case ACPI_NOTIFY_DEVICE_CHECK:
                if (!dock_in_progress(ds) && acpi_bus_get_device(ds->handle,
                   &tmp)) {
                        begin_dock(ds);
@@ -622,20 +742,19 @@ static void dock_notify(acpi_handle handle, u32 event, void *data)
                        hotplug_dock_devices(ds, event);
                        complete_dock(ds);
                        dock_event(ds, event, DOCK_EVENT);
+                       dock_lock(ds, 1);
+                       break;
                }
-               break;
-       case ACPI_NOTIFY_DEVICE_CHECK:
-       /*
-         * According to acpi spec 3.0a, if a DEVICE_CHECK notification
-         * is sent and _DCK is present, it is assumed to mean an
-         * undock request.  This notify routine will only be called
-         * for objects defining _DCK, so we will fall through to eject
-         * request here.  However, we will pass an eject request through
-        * to the driver who wish to hotplug.
-         */
+               if (dock_present(ds) || dock_in_progress(ds))
+                       break;
+               /* This is a surprise removal */
+               surprise_removal = 1;
+               event = ACPI_NOTIFY_EJECT_REQUEST;
+               /* Fall back */
        case ACPI_NOTIFY_EJECT_REQUEST:
                begin_undock(ds);
-               if (immediate_undock)
+               if ((immediate_undock && !(ds->flags & DOCK_IS_ATA))
+                  || surprise_removal)
                        handle_eject_request(ds, event);
                else
                        dock_event(ds, event, UNDOCK_EVENT);
@@ -645,6 +764,51 @@ static void dock_notify(acpi_handle handle, u32 event, void *data)
        }
 }
 
+struct dock_data {
+       acpi_handle handle;
+       unsigned long event;
+       struct dock_station *ds;
+};
+
+static void acpi_dock_deferred_cb(void *context)
+{
+       struct dock_data *data = (struct dock_data *)context;
+
+       dock_notify(data->handle, data->event, data->ds);
+       kfree(data);
+}
+
+static int acpi_dock_notifier_call(struct notifier_block *this,
+       unsigned long event, void *data)
+{
+       struct dock_station *dock_station;
+       acpi_handle handle = (acpi_handle)data;
+
+       if (event != ACPI_NOTIFY_BUS_CHECK && event != ACPI_NOTIFY_DEVICE_CHECK
+          && event != ACPI_NOTIFY_EJECT_REQUEST)
+               return 0;
+       list_for_each_entry(dock_station, &dock_stations, sibling) {
+               if (dock_station->handle == handle) {
+                       struct dock_data *dock_data;
+
+                       dock_data = kmalloc(sizeof(*dock_data), GFP_KERNEL);
+                       if (!dock_data)
+                               return 0;
+                       dock_data->handle = handle;
+                       dock_data->event = event;
+                       dock_data->ds = dock_station;
+                       acpi_os_hotplug_execute(acpi_dock_deferred_cb,
+                               dock_data);
+                       return 0 ;
+               }
+       }
+       return 0;
+}
+
+static struct notifier_block dock_acpi_notifier = {
+       .notifier_call = acpi_dock_notifier_call,
+};
+
 /**
  * find_dock_devices - find devices on the dock station
  * @handle: the handle of the device we are examining
@@ -691,8 +855,14 @@ fdd_out:
 static ssize_t show_docked(struct device *dev,
                           struct device_attribute *attr, char *buf)
 {
-       return snprintf(buf, PAGE_SIZE, "%d\n", dock_present(dock_station));
+       struct acpi_device *tmp;
 
+       struct dock_station *dock_station = *((struct dock_station **)
+               dev->platform_data);
+
+       if (ACPI_SUCCESS(acpi_bus_get_device(dock_station->handle, &tmp)))
+               return snprintf(buf, PAGE_SIZE, "1\n");
+       return snprintf(buf, PAGE_SIZE, "0\n");
 }
 static DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL);
 
@@ -702,6 +872,8 @@ static DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL);
 static ssize_t show_flags(struct device *dev,
                          struct device_attribute *attr, char *buf)
 {
+       struct dock_station *dock_station = *((struct dock_station **)
+               dev->platform_data);
        return snprintf(buf, PAGE_SIZE, "%d\n", dock_station->flags);
 
 }
@@ -714,6 +886,8 @@ static ssize_t write_undock(struct device *dev, struct device_attribute *attr,
                           const char *buf, size_t count)
 {
        int ret;
+       struct dock_station *dock_station = *((struct dock_station **)
+               dev->platform_data);
 
        if (!count)
                return -EINVAL;
@@ -730,16 +904,38 @@ static DEVICE_ATTR(undock, S_IWUSR, NULL, write_undock);
 static ssize_t show_dock_uid(struct device *dev,
                             struct device_attribute *attr, char *buf)
 {
-       unsigned long lbuf;
+       unsigned long long lbuf;
+       struct dock_station *dock_station = *((struct dock_station **)
+               dev->platform_data);
        acpi_status status = acpi_evaluate_integer(dock_station->handle,
                                        "_UID", NULL, &lbuf);
        if (ACPI_FAILURE(status))
            return 0;
 
-       return snprintf(buf, PAGE_SIZE, "%lx\n", lbuf);
+       return snprintf(buf, PAGE_SIZE, "%llx\n", lbuf);
 }
 static DEVICE_ATTR(uid, S_IRUGO, show_dock_uid, NULL);
 
+static ssize_t show_dock_type(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+       struct dock_station *dock_station = *((struct dock_station **)
+               dev->platform_data);
+       char *type;
+
+       if (dock_station->flags & DOCK_IS_DOCK)
+               type = "dock_station";
+       else if (dock_station->flags & DOCK_IS_ATA)
+               type = "ata_bay";
+       else if (dock_station->flags & DOCK_IS_BAT)
+               type = "battery_bay";
+       else
+               type = "unknown";
+
+       return snprintf(buf, PAGE_SIZE, "%s\n", type);
+}
+static DEVICE_ATTR(type, S_IRUGO, show_dock_type, NULL);
+
 /**
  * dock_add - add a new dock station
  * @handle: the dock station handle
@@ -750,8 +946,9 @@ static DEVICE_ATTR(uid, S_IRUGO, show_dock_uid, NULL);
 static int dock_add(acpi_handle handle)
 {
        int ret;
-       acpi_status status;
        struct dock_dependent_device *dd;
+       struct dock_station *dock_station;
+       struct platform_device *dock_device;
 
        /* allocate & initialize the dock_station private data */
        dock_station = kzalloc(sizeof(*dock_station), GFP_KERNEL);
@@ -761,25 +958,37 @@ static int dock_add(acpi_handle handle)
        dock_station->last_dock_time = jiffies - HZ;
        INIT_LIST_HEAD(&dock_station->dependent_devices);
        INIT_LIST_HEAD(&dock_station->hotplug_devices);
+       INIT_LIST_HEAD(&dock_station->sibling);
        spin_lock_init(&dock_station->dd_lock);
        mutex_init(&dock_station->hp_lock);
        ATOMIC_INIT_NOTIFIER_HEAD(&dock_notifier_list);
 
        /* initialize platform device stuff */
-       dock_device =
-               platform_device_register_simple(dock_device_name, 0, NULL, 0);
+       dock_station->dock_device =
+               platform_device_register_simple(dock_device_name,
+                       dock_station_count, NULL, 0);
+       dock_device = dock_station->dock_device;
        if (IS_ERR(dock_device)) {
                kfree(dock_station);
                dock_station = NULL;
                return PTR_ERR(dock_device);
        }
+       platform_device_add_data(dock_device, &dock_station,
+               sizeof(struct dock_station *));
 
        /* we want the dock device to send uevents */
-       dock_device->dev.uevent_suppress = 0;
+       dev_set_uevent_suppress(&dock_device->dev, 0);
+
+       if (is_dock(handle))
+               dock_station->flags |= DOCK_IS_DOCK;
+       if (is_ata(handle))
+               dock_station->flags |= DOCK_IS_ATA;
+       if (is_battery(handle))
+               dock_station->flags |= DOCK_IS_BAT;
 
        ret = device_create_file(&dock_device->dev, &dev_attr_docked);
        if (ret) {
-               printk("Error %d adding sysfs file\n", ret);
+               printk(KERN_ERR "Error %d adding sysfs file\n", ret);
                platform_device_unregister(dock_device);
                kfree(dock_station);
                dock_station = NULL;
@@ -787,7 +996,7 @@ static int dock_add(acpi_handle handle)
        }
        ret = device_create_file(&dock_device->dev, &dev_attr_undock);
        if (ret) {
-               printk("Error %d adding sysfs file\n", ret);
+               printk(KERN_ERR "Error %d adding sysfs file\n", ret);
                device_remove_file(&dock_device->dev, &dev_attr_docked);
                platform_device_unregister(dock_device);
                kfree(dock_station);
@@ -796,7 +1005,7 @@ static int dock_add(acpi_handle handle)
        }
        ret = device_create_file(&dock_device->dev, &dev_attr_uid);
        if (ret) {
-               printk("Error %d adding sysfs file\n", ret);
+               printk(KERN_ERR "Error %d adding sysfs file\n", ret);
                device_remove_file(&dock_device->dev, &dev_attr_docked);
                device_remove_file(&dock_device->dev, &dev_attr_undock);
                platform_device_unregister(dock_device);
@@ -806,7 +1015,7 @@ static int dock_add(acpi_handle handle)
        }
        ret = device_create_file(&dock_device->dev, &dev_attr_flags);
        if (ret) {
-               printk("Error %d adding sysfs file\n", ret);
+               printk(KERN_ERR "Error %d adding sysfs file\n", ret);
                device_remove_file(&dock_device->dev, &dev_attr_docked);
                device_remove_file(&dock_device->dev, &dev_attr_undock);
                device_remove_file(&dock_device->dev, &dev_attr_uid);
@@ -815,11 +1024,14 @@ static int dock_add(acpi_handle handle)
                dock_station = NULL;
                return ret;
        }
+       ret = device_create_file(&dock_device->dev, &dev_attr_type);
+       if (ret)
+               printk(KERN_ERR"Error %d adding sysfs file\n", ret);
 
        /* Find dependent devices */
        acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
-                           ACPI_UINT32_MAX, find_dock_devices, dock_station,
-                           NULL);
+                           ACPI_UINT32_MAX, find_dock_devices, NULL,
+                           dock_station, NULL);
 
        /* add the dock station as a device dependent on itself */
        dd = alloc_dock_dependent_device(handle);
@@ -831,24 +1043,12 @@ static int dock_add(acpi_handle handle)
        }
        add_dock_dependent_device(dock_station, dd);
 
-       /* register for dock events */
-       status = acpi_install_notify_handler(dock_station->handle,
-                                            ACPI_SYSTEM_NOTIFY,
-                                            dock_notify, dock_station);
-
-       if (ACPI_FAILURE(status)) {
-               printk(KERN_ERR PREFIX "Error installing notify handler\n");
-               ret = -ENODEV;
-               goto dock_add_err;
-       }
-
-       printk(KERN_INFO PREFIX "%s\n", ACPI_DOCK_DRIVER_DESCRIPTION);
-
+       dock_station_count++;
+       list_add(&dock_station->sibling, &dock_stations);
        return 0;
 
-dock_add_err:
-       kfree(dd);
 dock_add_err_unregister:
+       device_remove_file(&dock_device->dev, &dev_attr_type);
        device_remove_file(&dock_device->dev, &dev_attr_docked);
        device_remove_file(&dock_device->dev, &dev_attr_undock);
        device_remove_file(&dock_device->dev, &dev_attr_uid);
@@ -862,12 +1062,12 @@ dock_add_err_unregister:
 /**
  * dock_remove - free up resources related to the dock station
  */
-static int dock_remove(void)
+static int dock_remove(struct dock_station *dock_station)
 {
        struct dock_dependent_device *dd, *tmp;
-       acpi_status status;
+       struct platform_device *dock_device = dock_station->dock_device;
 
-       if (!dock_station)
+       if (!dock_station_count)
                return 0;
 
        /* remove dependent devices */
@@ -875,14 +1075,8 @@ static int dock_remove(void)
                                 list)
            kfree(dd);
 
-       /* remove dock notify handler */
-       status = acpi_remove_notify_handler(dock_station->handle,
-                                           ACPI_SYSTEM_NOTIFY,
-                                           dock_notify);
-       if (ACPI_FAILURE(status))
-               printk(KERN_ERR "Error removing notify handler\n");
-
        /* cleanup sysfs */
+       device_remove_file(&dock_device->dev, &dev_attr_type);
        device_remove_file(&dock_device->dev, &dev_attr_docked);
        device_remove_file(&dock_device->dev, &dev_attr_undock);
        device_remove_file(&dock_device->dev, &dev_attr_uid);
@@ -907,41 +1101,61 @@ static int dock_remove(void)
 static acpi_status
 find_dock(acpi_handle handle, u32 lvl, void *context, void **rv)
 {
-       int *count = context;
        acpi_status status = AE_OK;
 
        if (is_dock(handle)) {
                if (dock_add(handle) >= 0) {
-                       (*count)++;
                        status = AE_CTRL_TERMINATE;
                }
        }
        return status;
 }
 
-static int __init dock_init(void)
+static acpi_status
+find_bay(acpi_handle handle, u32 lvl, void *context, void **rv)
 {
-       int num = 0;
-
-       dock_station = NULL;
+       /* If bay is a dock, it's already handled */
+       if (is_ejectable_bay(handle) && !is_dock(handle))
+               dock_add(handle);
+       return AE_OK;
+}
 
+static int __init dock_init(void)
+{
        if (acpi_disabled)
                return 0;
 
        /* look for a dock station */
        acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
-                           ACPI_UINT32_MAX, find_dock, &num, NULL);
+                           ACPI_UINT32_MAX, find_dock, NULL, NULL, NULL);
 
-       if (!num)
-               printk(KERN_INFO "No dock devices found.\n");
+       /* look for bay */
+       acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
+                       ACPI_UINT32_MAX, find_bay, NULL, NULL, NULL);
+       if (!dock_station_count) {
+               printk(KERN_INFO PREFIX "No dock devices found.\n");
+               return 0;
+       }
 
+       register_acpi_bus_notifier(&dock_acpi_notifier);
+       printk(KERN_INFO PREFIX "%s: %d docks/bays found\n",
+               ACPI_DOCK_DRIVER_DESCRIPTION, dock_station_count);
        return 0;
 }
 
 static void __exit dock_exit(void)
 {
-       dock_remove();
+       struct dock_station *dock_station;
+       struct dock_station *tmp;
+
+       unregister_acpi_bus_notifier(&dock_acpi_notifier);
+       list_for_each_entry_safe(dock_station, tmp, &dock_stations, sibling)
+               dock_remove(dock_station);
 }
 
-postcore_initcall(dock_init);
+/*
+ * Must be called before drivers of devices in dock, otherwise we can't know
+ * which devices are in a dock
+ */
+subsys_initcall(dock_init);
 module_exit(dock_exit);