vmbus: Switch to use new generic UUID API

There are new types and helpers that are supposed to be used in new code.

As a preparation to get rid of legacy types and API functions do
the conversion here.

Cc: "K. Y. Srinivasan" <kys@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Stephen Hemminger <sthemmin@microsoft.com>
Cc: devel@linuxdriverproject.org
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by:  Michael Kelley <mikelley@microsoft.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

4 files changed, 30 insertions, 44 deletions

diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index bea4c9850247..23381c41d087 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -282,8 +282,8 @@ int vmbus_open(struct vmbus_channel *newchannel,
 EXPORT_SYMBOL_GPL(vmbus_open);
 
 /* Used for Hyper-V Socket: a guest client's connect() to the host */
-int vmbus_send_tl_connect_request(const uuid_le *shv_guest_servie_id,
-                                  const uuid_le *shv_host_servie_id)
+int vmbus_send_tl_connect_request(const guid_t *shv_guest_servie_id,
+                                  const guid_t *shv_host_servie_id)
 {
         struct vmbus_channel_tl_connect_request conn_msg;
         int ret;
diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c
index d01689079e9b..62703b354d6d 100644
--- a/drivers/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@ -141,7 +141,7 @@ static const struct vmbus_device vmbus_devs[] = {
 };
 
 static const struct {
-        uuid_le guid;
+        guid_t guid;
 } vmbus_unsupported_devs[] = {
         { HV_AVMA1_GUID },
         { HV_AVMA2_GUID },
@@ -171,26 +171,26 @@ static void vmbus_rescind_cleanup(struct vmbus_channel *channel)
         spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock, flags);
 }
 
-static bool is_unsupported_vmbus_devs(const uuid_le *guid)
+static bool is_unsupported_vmbus_devs(const guid_t *guid)
 {
         int i;
 
         for (i = 0; i < ARRAY_SIZE(vmbus_unsupported_devs); i++)
-                if (!uuid_le_cmp(*guid, vmbus_unsupported_devs[i].guid))
+                if (guid_equal(guid, &vmbus_unsupported_devs[i].guid))
                         return true;
         return false;
 }
 
 static u16 hv_get_dev_type(const struct vmbus_channel *channel)
 {
-        const uuid_le *guid = &channel->offermsg.offer.if_type;
+        const guid_t *guid = &channel->offermsg.offer.if_type;
         u16 i;
 
         if (is_hvsock_channel(channel) || is_unsupported_vmbus_devs(guid))
                 return HV_UNKNOWN;
 
         for (i = HV_IDE; i < HV_UNKNOWN; i++) {
-                if (!uuid_le_cmp(*guid, vmbus_devs[i].guid))
+                if (guid_equal(guid, &vmbus_devs[i].guid))
                         return i;
         }
         pr_info("Unknown GUID: %pUl\n", guid);
@@ -561,10 +561,10 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel)
         atomic_dec(&vmbus_connection.offer_in_progress);
 
         list_for_each_entry(channel, &vmbus_connection.chn_list, listentry) {
-                if (!uuid_le_cmp(channel->offermsg.offer.if_type,
-                                 newchannel->offermsg.offer.if_type) &&
-                    !uuid_le_cmp(channel->offermsg.offer.if_instance,
-                                 newchannel->offermsg.offer.if_instance)) {
+                if (guid_equal(&channel->offermsg.offer.if_type,
+                               &newchannel->offermsg.offer.if_type) &&
+                    guid_equal(&channel->offermsg.offer.if_instance,
+                               &newchannel->offermsg.offer.if_instance)) {
                         fnew = false;
                         break;
                 }
diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
index a1f6ce6e5974..cb86b133eb4d 100644
--- a/drivers/hv/hyperv_vmbus.h
+++ b/drivers/hv/hyperv_vmbus.h
@@ -312,8 +312,8 @@ extern const struct vmbus_channel_message_table_entry
 
 /* General vmbus interface */
 
-struct hv_device *vmbus_device_create(const uuid_le *type,
-                                      const uuid_le *instance,
+struct hv_device *vmbus_device_create(const guid_t *type,
+                                      const guid_t *instance,
                                       struct vmbus_channel *channel);
 
 int vmbus_device_register(struct hv_device *child_device_obj);
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index 403fee01572c..126c2de39e35 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -654,38 +654,28 @@ static int vmbus_uevent(struct device *device, struct kobj_uevent_env *env)
         return ret;
 }
 
-static const uuid_le null_guid;
-
-static inline bool is_null_guid(const uuid_le *guid)
-{
-        if (uuid_le_cmp(*guid, null_guid))
-                return false;
-        return true;
-}
-
 static const struct hv_vmbus_device_id *
-hv_vmbus_dev_match(const struct hv_vmbus_device_id *id, const uuid_le *guid)
-
+hv_vmbus_dev_match(const struct hv_vmbus_device_id *id, const guid_t *guid)
 {
         if (id == NULL)
                 return NULL; /* empty device table */
 
-        for (; !is_null_guid(&id->guid); id++)
-                if (!uuid_le_cmp(id->guid, *guid))
+        for (; !guid_is_null(&id->guid); id++)
+                if (guid_equal(&id->guid, guid))
                         return id;
 
         return NULL;
 }
 
 static const struct hv_vmbus_device_id *
-hv_vmbus_dynid_match(struct hv_driver *drv, const uuid_le *guid)
+hv_vmbus_dynid_match(struct hv_driver *drv, const guid_t *guid)
 {
         const struct hv_vmbus_device_id *id = NULL;
         struct vmbus_dynid *dynid;
 
         spin_lock(&drv->dynids.lock);
         list_for_each_entry(dynid, &drv->dynids.list, node) {
-                if (!uuid_le_cmp(dynid->id.guid, *guid)) {
+                if (guid_equal(&dynid->id.guid, guid)) {
                         id = &dynid->id;
                         break;
                 }
@@ -695,9 +685,7 @@ hv_vmbus_dynid_match(struct hv_driver *drv, const uuid_le *guid)
         return id;
 }
 
-static const struct hv_vmbus_device_id vmbus_device_null = {
-        .guid = NULL_UUID_LE,
-};
+static const struct hv_vmbus_device_id vmbus_device_null;
 
 /*
  * Return a matching hv_vmbus_device_id pointer.
@@ -706,7 +694,7 @@ static const struct hv_vmbus_device_id vmbus_device_null = {
 static const struct hv_vmbus_device_id *hv_vmbus_get_id(struct hv_driver *drv,
                                                         struct hv_device *dev)
 {
-        const uuid_le *guid = &dev->dev_type;
+        const guid_t *guid = &dev->dev_type;
         const struct hv_vmbus_device_id *id;
 
         /* When driver_override is set, only bind to the matching driver */
@@ -726,7 +714,7 @@ static const struct hv_vmbus_device_id *hv_vmbus_get_id(struct hv_driver *drv,
 }
 
 /* vmbus_add_dynid - add a new device ID to this driver and re-probe devices */
-static int vmbus_add_dynid(struct hv_driver *drv, uuid_le *guid)
+static int vmbus_add_dynid(struct hv_driver *drv, guid_t *guid)
 {
         struct vmbus_dynid *dynid;
 
@@ -764,10 +752,10 @@ static ssize_t new_id_store(struct device_driver *driver, const char *buf,
                             size_t count)
 {
         struct hv_driver *drv = drv_to_hv_drv(driver);
-        uuid_le guid;
+        guid_t guid;
         ssize_t retval;
 
-        retval = uuid_le_to_bin(buf, &guid);
+        retval = guid_parse(buf, &guid);
         if (retval)
                 return retval;
 
@@ -791,10 +779,10 @@ static ssize_t remove_id_store(struct device_driver *driver, const char *buf,
 {
         struct hv_driver *drv = drv_to_hv_drv(driver);
         struct vmbus_dynid *dynid, *n;
-        uuid_le guid;
+        guid_t guid;
         ssize_t retval;
 
-        retval = uuid_le_to_bin(buf, &guid);
+        retval = guid_parse(buf, &guid);
         if (retval)
                 return retval;
 
@@ -803,7 +791,7 @@ static ssize_t remove_id_store(struct device_driver *driver, const char *buf,
         list_for_each_entry_safe(dynid, n, &drv->dynids.list, node) {
                 struct hv_vmbus_device_id *id = &dynid->id;
 
-                if (!uuid_le_cmp(id->guid, guid)) {
+                if (guid_equal(&id->guid, &guid)) {
                         list_del(&dynid->node);
                         kfree(dynid);
                         retval = count;
@@ -1556,8 +1544,8 @@ int vmbus_add_channel_kobj(struct hv_device *dev, struct vmbus_channel *channel)
  * vmbus_device_create - Creates and registers a new child device
  * on the vmbus.
  */
-struct hv_device *vmbus_device_create(const uuid_le *type,
-                                      const uuid_le *instance,
+struct hv_device *vmbus_device_create(const guid_t *type,
+                                      const guid_t *instance,
                                       struct vmbus_channel *channel)
 {
         struct hv_device *child_device_obj;
@@ -1569,12 +1557,10 @@ struct hv_device *vmbus_device_create(const uuid_le *type,
         }
 
         child_device_obj->channel = channel;
-        memcpy(&child_device_obj->dev_type, type, sizeof(uuid_le));
-        memcpy(&child_device_obj->dev_instance, instance,
-               sizeof(uuid_le));
+        guid_copy(&child_device_obj->dev_type, type);
+        guid_copy(&child_device_obj->dev_instance, instance);
         child_device_obj->vendor_id = 0x1414; /* MSFT vendor ID */
 
-
         return child_device_obj;
 }