From 0e4855537a15f9595c86a33026ea0f98019e2ac2 Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Mon, 19 Mar 2012 17:58:43 +0200 Subject: [PATCH] --- yaml --- r: 304248 b: refs/heads/master c: 5192dda1751b2c4a988e6aa198c153d840a304a2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/mei/interface.h | 1 - trunk/drivers/staging/mei/wd.c | 5 ++--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 20705d0f3c7f..c46c76a6cf21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f3d2b499b73b3aa05feba35a9b04c6eec1a50ec +refs/heads/master: 5192dda1751b2c4a988e6aa198c153d840a304a2 diff --git a/trunk/drivers/staging/mei/interface.h b/trunk/drivers/staging/mei/interface.h index fb90c6f8a759..f934b094085a 100644 --- a/trunk/drivers/staging/mei/interface.h +++ b/trunk/drivers/staging/mei/interface.h @@ -52,7 +52,6 @@ int mei_flow_ctrl_creds(struct mei_device *dev, struct mei_cl *cl); int mei_wd_send(struct mei_device *dev); int mei_wd_stop(struct mei_device *dev, bool preserve); bool mei_wd_host_init(struct mei_device *dev); -void mei_wd_set_start_timeout(struct mei_device *dev, u16 timeout); /* * mei_watchdog_register - Registering watchdog interface * once we got connection to the WD Client diff --git a/trunk/drivers/staging/mei/wd.c b/trunk/drivers/staging/mei/wd.c index cf4c29d10e7f..d7f40dbce6b0 100644 --- a/trunk/drivers/staging/mei/wd.c +++ b/trunk/drivers/staging/mei/wd.c @@ -45,12 +45,11 @@ const uuid_le mei_wd_guid = UUID_LE(0x05B79A6F, 0x4628, 0x4D7F, 0x89, 0x9D, 0xA9, 0x15, 0x14, 0xCB, 0x32, 0xAB); -void mei_wd_set_start_timeout(struct mei_device *dev, u16 timeout) +static void mei_wd_set_start_timeout(struct mei_device *dev, u16 timeout) { dev_dbg(&dev->pdev->dev, "timeout=%d.\n", timeout); memcpy(dev->wd_data, mei_start_wd_params, MEI_WD_PARAMS_SIZE); - memcpy(dev->wd_data + MEI_WD_PARAMS_SIZE, - &timeout, sizeof(u16)); + memcpy(dev->wd_data + MEI_WD_PARAMS_SIZE, &timeout, sizeof(u16)); } /**