aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2013-01-08 16:07:16 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-08 19:40:45 -0500
commit37e7d6e74f2e80196410f6e5c7533d99fe9aa9d1 (patch)
treeca32e51e255646a3f35d6cf0cdd004edc0536a09
parent9f81abdac3629629a246fdc9e2a7c01ffd52ce8a (diff)
mei: move watchdog prototypes to mei_dev.h from interface.h
interface.h contains lower layer functionality Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/misc/mei/interface.h20
-rw-r--r--drivers/misc/mei/mei_dev.h17
2 files changed, 17 insertions, 20 deletions
diff --git a/drivers/misc/mei/interface.h b/drivers/misc/mei/interface.h
index 01d1ef518595..73bef545e4d5 100644
--- a/drivers/misc/mei/interface.h
+++ b/drivers/misc/mei/interface.h
@@ -49,24 +49,4 @@ static inline unsigned char mei_data2slots(size_t length)
49 49
50int mei_count_full_read_slots(struct mei_device *dev); 50int mei_count_full_read_slots(struct mei_device *dev);
51 51
52
53
54
55
56int mei_wd_send(struct mei_device *dev);
57int mei_wd_stop(struct mei_device *dev);
58int mei_wd_host_init(struct mei_device *dev);
59/*
60 * mei_watchdog_register - Registering watchdog interface
61 * once we got connection to the WD Client
62 * @dev - mei device
63 */
64void mei_watchdog_register(struct mei_device *dev);
65/*
66 * mei_watchdog_unregister - Unregistering watchdog interface
67 * @dev - mei device
68 */
69void mei_watchdog_unregister(struct mei_device *dev);
70
71
72#endif /* _MEI_INTERFACE_H_ */ 52#endif /* _MEI_INTERFACE_H_ */
diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h
index f3da1533c619..d41177b3fc69 100644
--- a/drivers/misc/mei/mei_dev.h
+++ b/drivers/misc/mei/mei_dev.h
@@ -371,6 +371,23 @@ int mei_amthif_irq_read_message(struct mei_cl_cb *complete_list,
371 struct mei_device *dev, struct mei_msg_hdr *mei_hdr); 371 struct mei_device *dev, struct mei_msg_hdr *mei_hdr);
372int mei_amthif_irq_read(struct mei_device *dev, s32 *slots); 372int mei_amthif_irq_read(struct mei_device *dev, s32 *slots);
373 373
374
375int mei_wd_send(struct mei_device *dev);
376int mei_wd_stop(struct mei_device *dev);
377int mei_wd_host_init(struct mei_device *dev);
378/*
379 * mei_watchdog_register - Registering watchdog interface
380 * once we got connection to the WD Client
381 * @dev - mei device
382 */
383void mei_watchdog_register(struct mei_device *dev);
384/*
385 * mei_watchdog_unregister - Unregistering watchdog interface
386 * @dev - mei device
387 */
388void mei_watchdog_unregister(struct mei_device *dev);
389
390
374/* 391/*
375 * Register Access Function 392 * Register Access Function
376 */ 393 */