mei: use consistently me_addr in the hbm structures

Use consistently me_addr name in hbm protocol structures
to represent in firmware client address

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/mei/hbm.c b/drivers/misc/mei/hbm.c
index 8041062..68a1cba 100644 (file)
--- a/drivers/misc/mei/hbm.c
+++ b/drivers/misc/mei/hbm.c
@@ -288,7 +288,7 @@ static int mei_hbm_prop_req(struct mei_device *dev)
 
 
        prop_req->hbm_cmd = HOST_CLIENT_PROPERTIES_REQ_CMD;
-       prop_req->address = next_client_index;
+       prop_req->me_addr = next_client_index;
 
        ret = mei_write_message(dev, mei_hdr, dev->wr_msg.data);
        if (ret) {
@@ -783,9 +783,9 @@ int mei_hbm_dispatch(struct mei_device *dev, struct mei_msg_hdr *hdr)
                        return -EPROTO;
                }
 
-               if (me_client->client_id != props_res->address) {
+               if (me_client->client_id != props_res->me_addr) {
                        dev_err(&dev->pdev->dev, "hbm: properties response: address mismatch %d ?= %d\n",
-                               me_client->client_id, props_res->address);
+                               me_client->client_id, props_res->me_addr);
                        return -EPROTO;
                }
 

diff --git a/drivers/misc/mei/hw.h b/drivers/misc/mei/hw.h
index dd448e5..50526f9 100644 (file)
--- a/drivers/misc/mei/hw.h
+++ b/drivers/misc/mei/hw.h
@@ -206,14 +206,13 @@ struct mei_client_properties {
 
 struct hbm_props_request {
        u8 hbm_cmd;
-       u8 address;
+       u8 me_addr;
        u8 reserved[2];
 } __packed;
 
-
 struct hbm_props_response {
        u8 hbm_cmd;
-       u8 address;
+       u8 me_addr;
        u8 status;
        u8 reserved[1];
        struct mei_client_properties client_properties;