---

yaml --- r: 268308 b: refs/heads/master c: a61c653 h: refs/heads/master v: v3
git-mirror · Sep 9, 2011 · 9f2d583 · 9f2d583
1 parent 21f1e56
commit 9f2d583
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55d3385672ba6315d45b396e9668e2660e426179
+refs/heads/master: a61c6530a6e2fb74f3e1a80bd367412ac4aa6925
diff --git a/trunk/drivers/staging/mei/interrupt.c b/trunk/drivers/staging/mei/interrupt.c
@@ -1393,7 +1393,7 @@ static int mei_irq_thread_write_handler(struct mei_io_list *cmpl_list,
  *
  * NOTE: This function is called by timer interrupt work
  */
-void mei_wd_timer(struct work_struct *work)
+void mei_timer(struct work_struct *work)
 {
 	unsigned long timeout;
 	struct mei_cl *cl_pos = NULL;
@@ -1403,7 +1403,7 @@ void mei_wd_timer(struct work_struct *work)
 	struct mei_cl_cb  *cb_next = NULL;
 
 	struct mei_device *dev = container_of(work,
-					struct mei_device, wd_work.work);
+					struct mei_device, timer_work.work);
 
 
 	mutex_lock(&dev->device_lock);
@@ -1495,7 +1495,7 @@ void mei_wd_timer(struct work_struct *work)
 		}
 	}
 out:
-	 schedule_delayed_work(&dev->wd_work, 2 * HZ);
+	 schedule_delayed_work(&dev->timer_work, 2 * HZ);
 	 mutex_unlock(&dev->device_lock);
 }
 

diff --git a/trunk/drivers/staging/mei/main.c b/trunk/drivers/staging/mei/main.c
@@ -170,15 +170,15 @@ static int __devinit mei_probe(struct pci_dev *pdev,
 		       pdev->irq);
 		goto unmap_memory;
 	}
-	INIT_DELAYED_WORK(&dev->wd_work, mei_wd_timer);
+	INIT_DELAYED_WORK(&dev->timer_work, mei_timer);
 	if (mei_hw_init(dev)) {
 		printk(KERN_ERR "mei: Init hw failure.\n");
 		err = -ENODEV;
 		goto release_irq;
 	}
 	mei_device = pdev;
 	pci_set_drvdata(pdev, dev);
-	schedule_delayed_work(&dev->wd_work, HZ);
+	schedule_delayed_work(&dev->timer_work, HZ);
 
 	mutex_unlock(&mei_mutex);
 
@@ -1154,7 +1154,7 @@ static int mei_pci_resume(struct device *device)
 	/* Start watchdog if stopped in suspend */
 	if (dev->wd_timeout) {
 		dev->wd_due_counter = 1;
-		schedule_delayed_work(&dev->wd_work, HZ);
+		schedule_delayed_work(&dev->timer_work, HZ);
 	}
 	return err;
 }

diff --git a/trunk/drivers/staging/mei/mei_dev.h b/trunk/drivers/staging/mei/mei_dev.h
@@ -209,7 +209,7 @@ struct mei_device {
 	 * lock for the device
 	 */
 	struct mutex device_lock; /* device lock */
-	struct delayed_work wd_work;	/* watch dog deleye work */
+	struct delayed_work timer_work;	/* MEI timer delayed work (timeouts) */
 	bool recvd_msg;
 	/*
 	 * hw states of host and fw(ME)
@@ -336,7 +336,7 @@ void mei_host_client_properties(struct mei_device *dev);
  */
 irqreturn_t mei_interrupt_quick_handler(int irq, void *dev_id);
 irqreturn_t mei_interrupt_thread_handler(int irq, void *dev_id);
-void mei_wd_timer(struct work_struct *work);
+void mei_timer(struct work_struct *work);
 
 /*
  *  MEI input output function prototype

diff --git a/trunk/drivers/staging/mei/wd.c b/trunk/drivers/staging/mei/wd.c
@@ -142,7 +142,7 @@ int mei_wd_stop(struct mei_device *dev, bool preserve)
 	int ret;
 	u16 wd_timeout = dev->wd_timeout;
 
-	cancel_delayed_work(&dev->wd_work);
+	cancel_delayed_work(&dev->timer_work);
 	if (dev->wd_cl.state != MEI_FILE_CONNECTED || !dev->wd_timeout)
 		return 0;