diff options
| author | Brian Wood <brian.j.wood@intel.com> | 2015-10-27 16:05:22 -0700 |
|---|---|---|
| committer | Bruce Beare <bruce.j.beare@intel.com> | 2015-11-18 16:53:51 -0800 |
| commit | ddb9fd16e0b4da5e33dd9f3254d0f14768d086a5 (patch) | |
| tree | 749cf722bfd87bca4047766887cfdacd28de63ce | |
| parent | 59d411b489f43fad93e782f63f835ce1ef31a907 (diff) | |
| download | edison-v3.10-ddb9fd16e0b4da5e33dd9f3254d0f14768d086a5.tar.gz | |
Cleanup watchdog driver code
This commit cleans up some unused variables causing
compile warnings as well as unused code blocks that
were disabled after finding they were causing
stability issues with the I2C buss due to IRQ
handling.
BUG=25764468
Change-Id: Ifad064581fb418bf66bc0874d8f5f4e3971f2a5a
Signed-off-by: Brian Wood <brian.j.wood@intel.com>
| -rw-r--r-- | drivers/watchdog/intel-mid_wdt.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/drivers/watchdog/intel-mid_wdt.c b/drivers/watchdog/intel-mid_wdt.c index e9ae57ef0b9..0ed95f5dcc4 100644 --- a/drivers/watchdog/intel-mid_wdt.c +++ b/drivers/watchdog/intel-mid_wdt.c @@ -49,11 +49,7 @@ static inline int wdt_command(int sub, u8 *in, int inlen) static int wdt_start(struct watchdog_device *wd) { - int ret, in_size; - /* Increase timeout due to SCU not setting watchdog correctly - * and misreporting to userspace watchdog daemon - */ - /* int timeout = wd->timeout; */ + int ret; int timeout = wd->timeout + MID_WDT_PRETIMEOUT; struct ipc_wd_start { @@ -61,12 +57,6 @@ static int wdt_start(struct watchdog_device *wd) u32 timeout; } ipc_wd_start = { timeout - MID_WDT_PRETIMEOUT, timeout }; - /* - * SCU expects the input size for watchdog IPC to - * be based on 4 bytes - */ - /* in_size = DIV_ROUND_UP(sizeof(ipc_wd_start), 4); */ - ret = wdt_command(SCU_WATCHDOG_START, (u8 *)&ipc_wd_start, sizeof(ipc_wd_start)); if (ret) { struct device *dev = watchdog_get_drvdata(wd); @@ -151,16 +141,6 @@ static int mid_wdt_probe(struct platform_device *pdev) watchdog_set_drvdata(wdt_dev, &pdev->dev); platform_set_drvdata(pdev, wdt_dev); -/* - ret = devm_request_irq(&pdev->dev, pdata->irq, mid_wdt_irq, - IRQF_SHARED | IRQF_NO_SUSPEND, "watchdog", - wdt_dev); - if (ret) { - dev_err(&pdev->dev, "error requesting warning irq %d\n", - pdata->irq); - return ret; - } -*/ ret = watchdog_register_device(wdt_dev); if (ret) { dev_err(&pdev->dev, "error registering watchdog device\n"); |