PCI: docking station: remove dock uevents
authorKristen Carlson Accardi <kristen.c.accardi@intel.com>
Tue, 1 Aug 2006 21:59:19 +0000 (14:59 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 3 Aug 2006 20:20:06 +0000 (13:20 -0700)
Remove uevent dock notifications.  There are no consumers
of these events at present, and uevents are likely not the
correct way to send this type of event anyway.

Until I get some kind of idea if anyone in userspace cares
about dock events, I will just not send any.

Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/acpi/dock.c
include/linux/kobject.h
lib/kobject_uevent.c

index 1c0a39d8b04e5de9474cf2b0ec967a8633fca3fe..578b99b71d9ce12556fe398bf5dfb196e8739f27 100644 (file)
@@ -58,8 +58,8 @@ struct dock_dependent_device {
 };
 
 #define DOCK_DOCKING   0x00000001
-#define DOCK_EVENT     KOBJ_DOCK
-#define UNDOCK_EVENT   KOBJ_UNDOCK
+#define DOCK_EVENT     3
+#define UNDOCK_EVENT   2
 
 static struct dock_station *dock_station;
 
@@ -322,11 +322,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 acpi_device *device;
-
-       device = dock_create_acpi_device(ds->handle);
-       if (device)
-               kobject_uevent(&device->kobj, num);
+       /*
+        * we don't do events until someone tells me that
+        * they would like to have them.
+        */
 }
 
 /**
index 0503b2ed8bae8ae4e2fb89f01df052e5cebe3497..2d229327959ed9809042af03c8fdb917913e000e 100644 (file)
@@ -46,8 +46,6 @@ enum kobject_action {
        KOBJ_UMOUNT     = (__force kobject_action_t) 0x05,      /* umount event for block devices (broken) */
        KOBJ_OFFLINE    = (__force kobject_action_t) 0x06,      /* device offline */
        KOBJ_ONLINE     = (__force kobject_action_t) 0x07,      /* device online */
-       KOBJ_UNDOCK     = (__force kobject_action_t) 0x08,      /* undocking */
-       KOBJ_DOCK       = (__force kobject_action_t) 0x09,      /* dock */
 };
 
 struct kobject {
index 2b1530fc573bfaa4af0c7288eba1fce7af51513f..7f20e7b857cb559b7624d89ca4c52bbf86bc1b65 100644 (file)
@@ -50,10 +50,6 @@ static char *action_to_string(enum kobject_action action)
                return "offline";
        case KOBJ_ONLINE:
                return "online";
-       case KOBJ_DOCK:
-               return "dock";
-       case KOBJ_UNDOCK:
-               return "undock";
        default:
                return NULL;
        }