summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2012-03-19 17:58:43 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-10 09:35:52 -0700
commit5192dda1751b2c4a988e6aa198c153d840a304a2 (patch)
tree1cdcbc78d477d6e2f5ea5c34b672f52b9c989034
parent2f3d2b499b73b3aa05feba35a9b04c6eec1a50ec (diff)
staging/mei: mei_wd_set_start_timeout should be static
mei_wd_set_start_timeout is only used from within wd.c so remove its declaration from interface.h and mark it static Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/mei/interface.h1
-rw-r--r--drivers/staging/mei/wd.c5
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/mei/interface.h b/drivers/staging/mei/interface.h
index fb90c6f8a759..f934b094085a 100644
--- a/drivers/staging/mei/interface.h
+++ b/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/drivers/staging/mei/wd.c b/drivers/staging/mei/wd.c
index cf4c29d10e7f..d7f40dbce6b0 100644
--- a/drivers/staging/mei/wd.c
+++ b/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));
}
/**