Staging: hv: Get rid of the forward declaration for vmbus_uevent

Get rid of the forward declaration of vmbus_uevent by moving
the code around.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Mike Sterling <mike.sterling@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index f292b03..5243d98 100644 (file)
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -51,7 +51,6 @@ static int vmbus_match(struct device *device, struct device_driver *driver);
 static int vmbus_probe(struct device *device);
 static int vmbus_remove(struct device *device);
 static void vmbus_shutdown(struct device *device);
-static int vmbus_uevent(struct device *device, struct kobj_uevent_env *env);
 
 static irqreturn_t vmbus_isr(int irq, void *dev_id);
 
@@ -98,6 +97,81 @@ static struct device_attribute vmbus_device_attrs[] = {
        __ATTR_NULL
 };
 
+/*
+ * vmbus_uevent - add uevent for our device
+ *
+ * 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
+ */
+static int vmbus_uevent(struct device *device, struct kobj_uevent_env *env)
+{
+       struct hv_device *dev = device_to_hv_device(device);
+       int ret;
+
+       DPRINT_INFO(VMBUS_DRV, "generating uevent - VMBUS_DEVICE_CLASS_GUID={"
+                   "%02x%02x%02x%02x-%02x%02x-%02x%02x-"
+                   "%02x%02x%02x%02x%02x%02x%02x%02x}",
+                   dev->dev_type.data[3], dev->dev_type.data[2],
+                   dev->dev_type.data[1], dev->dev_type.data[0],
+                   dev->dev_type.data[5], dev->dev_type.data[4],
+                   dev->dev_type.data[7], dev->dev_type.data[6],
+                   dev->dev_type.data[8], dev->dev_type.data[9],
+                   dev->dev_type.data[10],
+                   dev->dev_type.data[11],
+                   dev->dev_type.data[12],
+                   dev->dev_type.data[13],
+                   dev->dev_type.data[14],
+                   dev->dev_type.data[15]);
+
+       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.data[3],
+                            dev->dev_type.data[2],
+                            dev->dev_type.data[1],
+                            dev->dev_type.data[0],
+                            dev->dev_type.data[5],
+                            dev->dev_type.data[4],
+                            dev->dev_type.data[7],
+                            dev->dev_type.data[6],
+                            dev->dev_type.data[8],
+                            dev->dev_type.data[9],
+                            dev->dev_type.data[10],
+                            dev->dev_type.data[11],
+                            dev->dev_type.data[12],
+                            dev->dev_type.data[13],
+                            dev->dev_type.data[14],
+                            dev->dev_type.data[15]);
+
+       if (ret)
+               return ret;
+
+       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.data[3],
+                            dev->dev_instance.data[2],
+                            dev->dev_instance.data[1],
+                            dev->dev_instance.data[0],
+                            dev->dev_instance.data[5],
+                            dev->dev_instance.data[4],
+                            dev->dev_instance.data[7],
+                            dev->dev_instance.data[6],
+                            dev->dev_instance.data[8],
+                            dev->dev_instance.data[9],
+                            dev->dev_instance.data[10],
+                            dev->dev_instance.data[11],
+                            dev->dev_instance.data[12],
+                            dev->dev_instance.data[13],
+                            dev->dev_instance.data[14],
+                            dev->dev_instance.data[15]);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
 /* The one and only one */
 static struct hv_bus  hv_bus = {
        .bus.name =             "vmbus",
@@ -627,81 +701,6 @@ void vmbus_child_device_unregister(struct hv_device *device_obj)
 }
 
 /*
- * vmbus_uevent - add uevent for our device
- *
- * 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
- */
-static int vmbus_uevent(struct device *device, struct kobj_uevent_env *env)
-{
-       struct hv_device *dev = device_to_hv_device(device);
-       int ret;
-
-       DPRINT_INFO(VMBUS_DRV, "generating uevent - VMBUS_DEVICE_CLASS_GUID={"
-                   "%02x%02x%02x%02x-%02x%02x-%02x%02x-"
-                   "%02x%02x%02x%02x%02x%02x%02x%02x}",
-                   dev->dev_type.data[3], dev->dev_type.data[2],
-                   dev->dev_type.data[1], dev->dev_type.data[0],
-                   dev->dev_type.data[5], dev->dev_type.data[4],
-                   dev->dev_type.data[7], dev->dev_type.data[6],
-                   dev->dev_type.data[8], dev->dev_type.data[9],
-                   dev->dev_type.data[10],
-                   dev->dev_type.data[11],
-                   dev->dev_type.data[12],
-                   dev->dev_type.data[13],
-                   dev->dev_type.data[14],
-                   dev->dev_type.data[15]);
-
-       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.data[3],
-                            dev->dev_type.data[2],
-                            dev->dev_type.data[1],
-                            dev->dev_type.data[0],
-                            dev->dev_type.data[5],
-                            dev->dev_type.data[4],
-                            dev->dev_type.data[7],
-                            dev->dev_type.data[6],
-                            dev->dev_type.data[8],
-                            dev->dev_type.data[9],
-                            dev->dev_type.data[10],
-                            dev->dev_type.data[11],
-                            dev->dev_type.data[12],
-                            dev->dev_type.data[13],
-                            dev->dev_type.data[14],
-                            dev->dev_type.data[15]);
-
-       if (ret)
-               return ret;
-
-       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.data[3],
-                            dev->dev_instance.data[2],
-                            dev->dev_instance.data[1],
-                            dev->dev_instance.data[0],
-                            dev->dev_instance.data[5],
-                            dev->dev_instance.data[4],
-                            dev->dev_instance.data[7],
-                            dev->dev_instance.data[6],
-                            dev->dev_instance.data[8],
-                            dev->dev_instance.data[9],
-                            dev->dev_instance.data[10],
-                            dev->dev_instance.data[11],
-                            dev->dev_instance.data[12],
-                            dev->dev_instance.data[13],
-                            dev->dev_instance.data[14],
-                            dev->dev_instance.data[15]);
-       if (ret)
-               return ret;
-
-       return 0;
-}
-
-/*
  * vmbus_match - Attempt to match the specified device to the specified driver
  */
 static int vmbus_match(struct device *device, struct device_driver *driver)