Commit 5669021e authored by Kristen Carlson Accardi's avatar Kristen Carlson Accardi Committed by Greg Kroah-Hartman
Browse files

PCI: docking station: remove dock uevents 



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: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 321311af

drivers/acpi/dock.c

+6 −7
Original line number Diff line number Diff line
@@ -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.

	 */

}



/**

include/linux/kobject.h

+0 −2
Original line number Diff line number Diff line
@@ -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 {

lib/kobject_uevent.c

+0 −4
Original line number Diff line number Diff line
@@ -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;

	}