---

yaml --- r: 259546 b: refs/heads/master c: a93218e h: refs/heads/master v: v3
git-mirror · Jun 28, 2011 · a4172b7 · a4172b7
1 parent 98b5cd4
commit a4172b7
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb9af0acec3858d835276935df5d5eecd62535d0
+refs/heads/master: a93218e14c50e89c1846a8b7849c79b78f58be87
diff --git a/trunk/drivers/staging/mei/init.c b/trunk/drivers/staging/mei/init.c
@@ -39,7 +39,6 @@ void mei_initialize_list(struct mei_io_list *list, struct mei_device *dev)
 	/* initialize our queue list */
 	INIT_LIST_HEAD(&list->mei_cb.cb_list);
 	list->status = 0;
-	list->device_extension = dev;
 }
 
 /**
@@ -521,7 +520,6 @@ void mei_host_client_properties(struct mei_device *dev)
 	 * with associated host client
 	 */
 	bitmap_zero(dev->host_clients_map, MEI_CLIENTS_MAX);
-	dev->write_hang = -1;
 	dev->open_handle_count = 0;
 	bitmap_set(dev->host_clients_map, 0, 3);
 	dev->mei_state = MEI_ENABLED;

diff --git a/trunk/drivers/staging/mei/interface.c b/trunk/drivers/staging/mei/interface.c
@@ -179,7 +179,6 @@ int mei_write_message(struct mei_device *dev,
 	if ((dev->me_hw_state & ME_RDY_HRA) != ME_RDY_HRA)
 		return 0;
 
-	dev->write_hang = 0;
 	return 1;
 }
 

diff --git a/trunk/drivers/staging/mei/interrupt.c b/trunk/drivers/staging/mei/interrupt.c
@@ -1192,7 +1192,6 @@ static int mei_irq_thread_write_handler(struct mei_io_list *cmpl_list,
 		dev_dbg(&dev->pdev->dev, "host buffer is not empty.\n");
 		return 0;
 	}
-	dev->write_hang = -1;
 	*slots = mei_count_empty_write_slots(dev);
 	/* complete all waiting for write CB */
 	dev_dbg(&dev->pdev->dev, "complete all waiting for write cb.\n");

diff --git a/trunk/drivers/staging/mei/mei_dev.h b/trunk/drivers/staging/mei/mei_dev.h
@@ -169,7 +169,6 @@ struct mei_cl {
 struct mei_io_list {
 	struct mei_cl_cb mei_cb;
 	int status;
-	struct mei_device *device_extension;
 };
 
 /* MEI private device struct */
@@ -265,7 +264,6 @@ struct mei_device {
 	bool iamthif_flow_control_pending;
 	bool iamthif_ioctl;
 	bool iamthif_canceled;
-	u8 write_hang;
 };