diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2013-01-08 23:07:16 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-08 16:40:45 -0800 |
| commit | 37e7d6e74f2e80196410f6e5c7533d99fe9aa9d1 (patch) | |
| tree | ca32e51e255646a3f35d6cf0cdd004edc0536a09 | |
| parent | 9f81abdac3629629a246fdc9e2a7c01ffd52ce8a (diff) | |
| download | op-kernel-dev-37e7d6e74f2e80196410f6e5c7533d99fe9aa9d1.zip op-kernel-dev-37e7d6e74f2e80196410f6e5c7533d99fe9aa9d1.tar.gz | |
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.h | 20 | ||||
| -rw-r--r-- | drivers/misc/mei/mei_dev.h | 17 |
2 files changed, 17 insertions, 20 deletions
diff --git a/drivers/misc/mei/interface.h b/drivers/misc/mei/interface.h index 01d1ef5..73bef54 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) int mei_count_full_read_slots(struct mei_device *dev); - - - - -int mei_wd_send(struct mei_device *dev); -int mei_wd_stop(struct mei_device *dev); -int mei_wd_host_init(struct mei_device *dev); -/* - * mei_watchdog_register - Registering watchdog interface - * once we got connection to the WD Client - * @dev - mei device - */ -void mei_watchdog_register(struct mei_device *dev); -/* - * mei_watchdog_unregister - Unregistering watchdog interface - * @dev - mei device - */ -void mei_watchdog_unregister(struct mei_device *dev); - - #endif /* _MEI_INTERFACE_H_ */ diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h index f3da153..d41177b 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, struct mei_device *dev, struct mei_msg_hdr *mei_hdr); int mei_amthif_irq_read(struct mei_device *dev, s32 *slots); + +int mei_wd_send(struct mei_device *dev); +int mei_wd_stop(struct mei_device *dev); +int mei_wd_host_init(struct mei_device *dev); +/* + * mei_watchdog_register - Registering watchdog interface + * once we got connection to the WD Client + * @dev - mei device + */ +void mei_watchdog_register(struct mei_device *dev); +/* + * mei_watchdog_unregister - Unregistering watchdog interface + * @dev - mei device + */ +void mei_watchdog_unregister(struct mei_device *dev); + + /* * Register Access Function */ |
