From ae929ccebb2de68fee47734ae034e295a6c5ecf6 Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Thu, 1 Nov 2012 21:17:17 +0200 Subject: [PATCH] --- yaml --- r: 336958 b: refs/heads/master c: c7d3df354dcb7477900b29a1200744a8c976c03a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/misc/mei/init.c | 2 -- trunk/drivers/misc/mei/mei_dev.h | 1 - trunk/drivers/misc/mei/wd.c | 5 +---- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index eedc134f3eb8..40c66b60f5a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15ea19105bdeef36820ade6754b9b7f1e3511e98 +refs/heads/master: c7d3df354dcb7477900b29a1200744a8c976c03a diff --git a/trunk/drivers/misc/mei/init.c b/trunk/drivers/misc/mei/init.c index 4a8eb920f7fb..8c3c2689f70c 100644 --- a/trunk/drivers/misc/mei/init.c +++ b/trunk/drivers/misc/mei/init.c @@ -111,8 +111,6 @@ struct mei_device *mei_device_init(struct pci_dev *pdev) init_waitqueue_head(&dev->wait_stop_wd); dev->dev_state = MEI_DEV_INITIALIZING; dev->iamthif_state = MEI_IAMTHIF_IDLE; - dev->wd_interface_reg = false; - mei_io_list_init(&dev->read_list); mei_io_list_init(&dev->write_list); diff --git a/trunk/drivers/misc/mei/mei_dev.h b/trunk/drivers/misc/mei/mei_dev.h index 57a5a4e4ee4d..8b96d99b8577 100644 --- a/trunk/drivers/misc/mei/mei_dev.h +++ b/trunk/drivers/misc/mei/mei_dev.h @@ -249,7 +249,6 @@ struct mei_device { struct mei_cl wd_cl; enum mei_wd_states wd_state; - bool wd_interface_reg; bool wd_pending; u16 wd_timeout; unsigned char wd_data[MEI_WD_START_MSG_SIZE]; diff --git a/trunk/drivers/misc/mei/wd.c b/trunk/drivers/misc/mei/wd.c index 8edb054d4b36..4fc2b3d4680a 100644 --- a/trunk/drivers/misc/mei/wd.c +++ b/trunk/drivers/misc/mei/wd.c @@ -360,23 +360,20 @@ void mei_watchdog_register(struct mei_device *dev) if (watchdog_register_device(&amt_wd_dev)) { dev_err(&dev->pdev->dev, "wd: unable to register watchdog device.\n"); - dev->wd_interface_reg = false; return; } dev_dbg(&dev->pdev->dev, "wd: successfully register watchdog interface.\n"); - dev->wd_interface_reg = true; watchdog_set_drvdata(&amt_wd_dev, dev); } void mei_watchdog_unregister(struct mei_device *dev) { - if (!dev->wd_interface_reg) + if (test_bit(WDOG_UNREGISTERED, &amt_wd_dev.status)) return; watchdog_set_drvdata(&amt_wd_dev, NULL); watchdog_unregister_device(&amt_wd_dev); - dev->wd_interface_reg = false; }