On Thu, Jul 20, 2017 at 10:56 AM, Christoph Hellwig <h...@lst.de> wrote:
> Switch thunderbolt to the new uuid type.
>
> Signed-off-by: Christoph Hellwig <h...@lst.de>
Reviewed-by: Amir Goldstein <amir7...@gmail.com>
> ---
> drivers/thunderbolt/switch.c | 8 ++++----
> drivers/thunderbolt/tb.h | 4 ++--
> drivers/thunderbolt/tb_msgs.h | 12 ++++++------
> 3 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c
> index ab3e8f410444..c6f41b7d38b0 100644
> --- a/drivers/thunderbolt/switch.c
> +++ b/drivers/thunderbolt/switch.c
> @@ -30,7 +30,7 @@ static DEFINE_IDA(nvm_ida);
>
> struct nvm_auth_status {
> struct list_head list;
> - uuid_be uuid;
> + uuid_t uuid;
> u32 status;
> };
>
> @@ -47,7 +47,7 @@ static struct nvm_auth_status *__nvm_get_auth_status(const
> struct tb_switch *sw)
> struct nvm_auth_status *st;
>
> list_for_each_entry(st, &nvm_auth_status_cache, list) {
> - if (!uuid_be_cmp(st->uuid, *sw->uuid))
> + if (uuid_equal(&st->uuid, sw->uuid))
> return st;
> }
>
> @@ -1460,7 +1460,7 @@ struct tb_sw_lookup {
> struct tb *tb;
> u8 link;
> u8 depth;
> - const uuid_be *uuid;
> + const uuid_t *uuid;
> };
>
> static int tb_switch_match(struct device *dev, void *data)
> @@ -1517,7 +1517,7 @@ struct tb_switch *tb_switch_find_by_link_depth(struct
> tb *tb, u8 link, u8 depth)
> * Returned switch has reference count increased so the caller needs to
> * call tb_switch_put() when done with the switch.
> */
> -struct tb_switch *tb_switch_find_by_uuid(struct tb *tb, const uuid_be *uuid)
> +struct tb_switch *tb_switch_find_by_uuid(struct tb *tb, const uuid_t *uuid)
> {
> struct tb_sw_lookup lookup;
> struct device *dev;
> diff --git a/drivers/thunderbolt/tb.h b/drivers/thunderbolt/tb.h
> index 3d9f64676e58..e0deee4f1eb0 100644
> --- a/drivers/thunderbolt/tb.h
> +++ b/drivers/thunderbolt/tb.h
> @@ -101,7 +101,7 @@ struct tb_switch {
> struct tb_dma_port *dma_port;
> struct tb *tb;
> u64 uid;
> - uuid_be *uuid;
> + uuid_t *uuid;
> u16 vendor;
> u16 device;
> const char *vendor_name;
> @@ -407,7 +407,7 @@ void tb_sw_set_unplugged(struct tb_switch *sw);
> struct tb_switch *get_switch_at_route(struct tb_switch *sw, u64 route);
> struct tb_switch *tb_switch_find_by_link_depth(struct tb *tb, u8 link,
> u8 depth);
> -struct tb_switch *tb_switch_find_by_uuid(struct tb *tb, const uuid_be *uuid);
> +struct tb_switch *tb_switch_find_by_uuid(struct tb *tb, const uuid_t *uuid);
>
> static inline unsigned int tb_switch_phy_port_from_link(unsigned int link)
> {
> diff --git a/drivers/thunderbolt/tb_msgs.h b/drivers/thunderbolt/tb_msgs.h
> index 85b6d33c0919..de6441e4a060 100644
> --- a/drivers/thunderbolt/tb_msgs.h
> +++ b/drivers/thunderbolt/tb_msgs.h
> @@ -179,7 +179,7 @@ struct icm_fr_pkg_get_topology_response {
>
> struct icm_fr_event_device_connected {
> struct icm_pkg_header hdr;
> - uuid_be ep_uuid;
> + uuid_t ep_uuid;
> u8 connection_key;
> u8 connection_id;
> u16 link_info;
> @@ -193,7 +193,7 @@ struct icm_fr_event_device_connected {
>
> struct icm_fr_pkg_approve_device {
> struct icm_pkg_header hdr;
> - uuid_be ep_uuid;
> + uuid_t ep_uuid;
> u8 connection_key;
> u8 connection_id;
> u16 reserved;
> @@ -207,7 +207,7 @@ struct icm_fr_event_device_disconnected {
>
> struct icm_fr_pkg_add_device_key {
> struct icm_pkg_header hdr;
> - uuid_be ep_uuid;
> + uuid_t ep_uuid;
> u8 connection_key;
> u8 connection_id;
> u16 reserved;
> @@ -216,7 +216,7 @@ struct icm_fr_pkg_add_device_key {
>
> struct icm_fr_pkg_add_device_key_response {
> struct icm_pkg_header hdr;
> - uuid_be ep_uuid;
> + uuid_t ep_uuid;
> u8 connection_key;
> u8 connection_id;
> u16 reserved;
> @@ -224,7 +224,7 @@ struct icm_fr_pkg_add_device_key_response {
>
> struct icm_fr_pkg_challenge_device {
> struct icm_pkg_header hdr;
> - uuid_be ep_uuid;
> + uuid_t ep_uuid;
> u8 connection_key;
> u8 connection_id;
> u16 reserved;
> @@ -233,7 +233,7 @@ struct icm_fr_pkg_challenge_device {
>
> struct icm_fr_pkg_challenge_device_response {
> struct icm_pkg_header hdr;
> - uuid_be ep_uuid;
> + uuid_t ep_uuid;
> u8 connection_key;
> u8 connection_id;
> u16 reserved;
> --
> 2.11.0
>
