mei: add me client remove functions

To support dynamic addition/remove we add wrappers
for removal of me clients

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

3 files changed, 38 insertions, 7 deletions

diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index 244b54692b48..10d0a04f45d6 100644
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -47,7 +47,6 @@ struct mei_me_client *mei_me_cl_by_uuid(const struct mei_device *dev,
         return NULL;
 }
 
-
 /**
  * mei_me_cl_by_id return index to me_clients for client_id
  *
@@ -70,6 +69,27 @@ struct mei_me_client *mei_me_cl_by_id(struct mei_device *dev, u8 client_id)
         return NULL;
 }
 
+/**
+ * mei_me_cl_remove - remove me client matching uuid and client_id
+ *
+ * @dev: the device structure
+ * @uuid: me client uuid
+ * @client_id: me client address
+ */
+void mei_me_cl_remove(struct mei_device *dev, const uuid_le *uuid, u8 client_id)
+{
+        struct mei_me_client *me_cl, *next;
+
+        list_for_each_entry_safe(me_cl, next, &dev->me_clients, list) {
+                if (uuid_le_cmp(*uuid, me_cl->props.protocol_name) == 0 &&
+                    me_cl->client_id == client_id) {
+                        list_del(&me_cl->list);
+                        kfree(me_cl);
+                        break;
+                }
+        }
+}
+
 
 /**
  * mei_cl_cmp_id - tells if the clients are the same
diff --git a/drivers/misc/mei/client.h b/drivers/misc/mei/client.h
index ddb95b2ee2ac..8871a852cfbb 100644
--- a/drivers/misc/mei/client.h
+++ b/drivers/misc/mei/client.h
@@ -27,6 +27,8 @@
 struct mei_me_client *mei_me_cl_by_uuid(const struct mei_device *dev,
                                         const uuid_le *cuuid);
 struct mei_me_client *mei_me_cl_by_id(struct mei_device *dev, u8 client_id);
+void mei_me_cl_remove(struct mei_device *dev,
+                      const uuid_le *uuid, u8 client_id);
 
 /*
  * MEI IO Functions
diff --git a/drivers/misc/mei/hbm.c b/drivers/misc/mei/hbm.c
index 45659de14186..5fb177b3bfef 100644
--- a/drivers/misc/mei/hbm.c
+++ b/drivers/misc/mei/hbm.c
@@ -71,21 +71,30 @@ void mei_hbm_idle(struct mei_device *dev)
 }
 
 /**
- * mei_hbm_reset - reset hbm counters and book keeping data structurs
+ * mei_me_cl_remove_all - remove all me clients
  *
  * @dev: the device structure
  */
-void mei_hbm_reset(struct mei_device *dev)
+static void mei_me_cl_remove_all(struct mei_device *dev)
 {
         struct mei_me_client *me_cl, *next;
+        list_for_each_entry_safe(me_cl, next, &dev->me_clients, list) {
+                        list_del(&me_cl->list);
+                        kfree(me_cl);
+        }
+}
 
+/**
+ * mei_hbm_reset - reset hbm counters and book keeping data structurs
+ *
+ * @dev: the device structure
+ */
+void mei_hbm_reset(struct mei_device *dev)
+{
         dev->me_client_presentation_num = 0;
         dev->me_client_index = 0;
 
-        list_for_each_entry_safe(me_cl, next, &dev->me_clients, list) {
-                list_del(&me_cl->list);
-                kfree(me_cl);
-        }
+        mei_me_cl_remove_all(dev);
 
         mei_hbm_idle(dev);
 }