UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: mei: renaming delayed work field and function to a meaningful name. 

the wd_work and mei_wd_timer() function was not just for watchdog.
mei managing the AMT watchdog going to be replace by the kernel watchdog
interface.

the mei_timer() will still manage the mei driver timeouts.

Signed-off-by: Oren Weil <oren.jer.weil@intel.com>
Acked-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Oren Weil 2011-09-07 09:03:13 +03:00 committed by Greg Kroah-Hartman
parent 55d3385672
commit a61c6530a6
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/mei/interrupt.c
View File

@ -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 * 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; unsigned long timeout;
struct mei_cl *cl_pos = NULL; 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_cl_cb *cb_next = NULL;
struct mei_device *dev = container_of(work, struct mei_device *dev = container_of(work,
struct mei_device, wd_work.work); struct mei_device, timer_work.work);
mutex_lock(&dev->device_lock); mutex_lock(&dev->device_lock);
@ -1495,7 +1495,7 @@ void mei_wd_timer(struct work_struct *work)
} }
} }
out: out:
schedule_delayed_work(&dev->wd_work, 2 * HZ); schedule_delayed_work(&dev->timer_work, 2 * HZ);
mutex_unlock(&dev->device_lock); mutex_unlock(&dev->device_lock);
} }

6
drivers/staging/mei/main.c
View File

@ -170,7 +170,7 @@ static int __devinit mei_probe(struct pci_dev *pdev,
pdev->irq); pdev->irq);
goto unmap_memory; 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)) { if (mei_hw_init(dev)) {
printk(KERN_ERR "mei: Init hw failure.\n"); printk(KERN_ERR "mei: Init hw failure.\n");
err = -ENODEV; err = -ENODEV;
@ -178,7 +178,7 @@ static int __devinit mei_probe(struct pci_dev *pdev,
} }
mei_device = pdev; mei_device = pdev;
pci_set_drvdata(pdev, dev); pci_set_drvdata(pdev, dev);
schedule_delayed_work(&dev->wd_work, HZ); schedule_delayed_work(&dev->timer_work, HZ);
mutex_unlock(&mei_mutex); mutex_unlock(&mei_mutex);
@ -1154,7 +1154,7 @@ static int mei_pci_resume(struct device *device)
/* Start watchdog if stopped in suspend */ /* Start watchdog if stopped in suspend */
if (dev->wd_timeout) { if (dev->wd_timeout) {
dev->wd_due_counter = 1; dev->wd_due_counter = 1;
schedule_delayed_work(&dev->wd_work, HZ); schedule_delayed_work(&dev->timer_work, HZ);
} }
return err; return err;
} }

4
drivers/staging/mei/mei_dev.h
View File

@ -209,7 +209,7 @@ struct mei_device {
* lock for the device * lock for the device
*/ */
struct mutex device_lock; /* device lock */ 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; bool recvd_msg;
/* /*
* hw states of host and fw(ME) * 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_quick_handler(int irq, void *dev_id);
irqreturn_t mei_interrupt_thread_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 * MEI input output function prototype

2
drivers/staging/mei/wd.c
View File

@ -142,7 +142,7 @@ int mei_wd_stop(struct mei_device *dev, bool preserve)
int ret; int ret;
u16 wd_timeout = dev->wd_timeout; 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) if (dev->wd_cl.state != MEI_FILE_CONNECTED || !dev->wd_timeout)
return 0; return 0;