Commit 0ddda660 authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman
Browse files

Staging: hv: vmbus: Cleanup vmbus_uevent() code 



Now generate appropriate uevent based on the modalias string. As part of this,
cleanup the existing uevent code.

[gregkh - fixed code to handle driver_data portion of struct
hv_vmbus_device_id]

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5cee7cb7

drivers/staging/hv/vmbus_drv.c

+10 −46
Original line number Diff line number Diff line
@@ -237,58 +237,22 @@ static struct device_attribute vmbus_device_attrs[] = { 
 * This routine is invoked when a device is added or removed on the vmbus to

 * generate a uevent to udev in the userspace. The udev will then look at its

 * rule and the uevent generated here to load the appropriate driver

 *

 * The alias string will be of the form vmbus:guid where guid is the string

 * representation of the device guid (each byte of the guid will be

 * represented with two hex characters.

 */

static int vmbus_uevent(struct device *device, struct kobj_uevent_env *env)

{

	struct hv_device *dev = device_to_hv_device(device);

	int ret;

	int i, ret;

	char alias_name[((sizeof((struct hv_vmbus_device_id *)0)->guid) + 1) * 2];



	ret = add_uevent_var(env, "VMBUS_DEVICE_CLASS_GUID={"

			     "%02x%02x%02x%02x-%02x%02x-%02x%02x-"

			     "%02x%02x%02x%02x%02x%02x%02x%02x}",

			     dev->dev_type.b[3],

			     dev->dev_type.b[2],

			     dev->dev_type.b[1],

			     dev->dev_type.b[0],

			     dev->dev_type.b[5],

			     dev->dev_type.b[4],

			     dev->dev_type.b[7],

			     dev->dev_type.b[6],

			     dev->dev_type.b[8],

			     dev->dev_type.b[9],

			     dev->dev_type.b[10],

			     dev->dev_type.b[11],

			     dev->dev_type.b[12],

			     dev->dev_type.b[13],

			     dev->dev_type.b[14],

			     dev->dev_type.b[15]);



	if (ret)

		return ret;

	for (i = 0; i < ((sizeof((struct hv_vmbus_device_id *)0)->guid) * 2); i += 2)

		sprintf(&alias_name[i], "%02x", dev->dev_type.b[i/2]);



	ret = add_uevent_var(env, "VMBUS_DEVICE_DEVICE_GUID={"

			     "%02x%02x%02x%02x-%02x%02x-%02x%02x-"

			     "%02x%02x%02x%02x%02x%02x%02x%02x}",

			     dev->dev_instance.b[3],

			     dev->dev_instance.b[2],

			     dev->dev_instance.b[1],

			     dev->dev_instance.b[0],

			     dev->dev_instance.b[5],

			     dev->dev_instance.b[4],

			     dev->dev_instance.b[7],

			     dev->dev_instance.b[6],

			     dev->dev_instance.b[8],

			     dev->dev_instance.b[9],

			     dev->dev_instance.b[10],

			     dev->dev_instance.b[11],

			     dev->dev_instance.b[12],

			     dev->dev_instance.b[13],

			     dev->dev_instance.b[14],

			     dev->dev_instance.b[15]);

	if (ret)

	ret = add_uevent_var(env, "MODALIAS=vmbus:%s", alias_name);

	return ret;



	return 0;

}