Skip to content

Commit

Permalink
PCI: docking station: remove dock uevents
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kristen Carlson Accardi authored and Greg Kroah-Hartman committed Aug 3, 2006
1 parent 321311a commit 5669021
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 13 deletions.
13 changes: 6 additions & 7 deletions drivers/acpi/dock.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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.
*/
}

/**
Expand Down
2 changes: 0 additions & 2 deletions include/linux/kobject.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 0 additions & 4 deletions lib/kobject_uevent.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 5669021

Please sign in to comment.