summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Jeffery <andrew@aj.id.au>2018-08-08 16:36:10 +0930
committerAndrew Jeffery <andrew@aj.id.au>2018-09-05 17:44:24 +0930
commit17971e44a9c11df80d229cf1a41230baa7fa65e0 (patch)
treeac0599a70d1f99c1553db13b3e5376d295bbb41c
parent17079d1dcbe76bd4f9d1803bef6d16c3799c1e8f (diff)
downloadphosphor-mboxbridge-17971e44a9c11df80d229cf1a41230baa7fa65e0.tar.gz
phosphor-mboxbridge-17971e44a9c11df80d229cf1a41230baa7fa65e0.zip
lpc: Rename reset_lpc to lpc_reset
Change-Id: Iee234830b7ea93a7c51b45217d87162e14ef56ee Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
-rw-r--r--control.c2
-rw-r--r--lpc.h2
-rw-r--r--lpc_reset.c4
-rw-r--r--mboxd.c6
-rw-r--r--mboxd_msg.c2
-rw-r--r--vpnor/lpc_reset.cpp4
6 files changed, 10 insertions, 10 deletions
diff --git a/control.c b/control.c
index 36dd542..92ad21e 100644
--- a/control.c
+++ b/control.c
@@ -48,7 +48,7 @@ int control_reset(struct mbox_context *context)
* Better set the bmc event to notify the host of this.
*/
reset_all_windows(context, SET_BMC_EVENT);
- rc = reset_lpc(context);
+ rc = lpc_reset(context);
if (rc < 0) {
return rc;
}
diff --git a/lpc.h b/lpc.h
index 4d792de..cf91d42 100644
--- a/lpc.h
+++ b/lpc.h
@@ -8,6 +8,6 @@ int lpc_dev_init(struct mbox_context *context);
void lpc_dev_free(struct mbox_context *context);
int lpc_map_flash(struct mbox_context *context);
int lpc_map_memory(struct mbox_context *context);
-int reset_lpc(struct mbox_context *context);
+int lpc_reset(struct mbox_context *context);
#endif /* LPC_H */
diff --git a/lpc_reset.c b/lpc_reset.c
index 73fd214..b1e7939 100644
--- a/lpc_reset.c
+++ b/lpc_reset.c
@@ -7,12 +7,12 @@
#include "lpc.h"
/*
- * reset_lpc() - Reset the lpc bus mapping
+ * lpc_reset() - Reset the lpc bus mapping
* @context: The mbox context pointer
*
* Return: 0 on success otherwise negative error code
*/
-int reset_lpc(struct mbox_context *context)
+int lpc_reset(struct mbox_context *context)
{
return lpc_map_flash(context);
}
diff --git a/mboxd.c b/mboxd.c
index 541e117..634ae03 100644
--- a/mboxd.c
+++ b/mboxd.c
@@ -140,7 +140,7 @@ static int poll_loop(struct mbox_context *context)
case SIGHUP:
/* Host didn't request reset -> Notify it */
reset_all_windows(context, SET_BMC_EVENT);
- rc = reset_lpc(context);
+ rc = lpc_reset(context);
if (rc < 0) {
MSG_ERR("WARNING: Failed to point the "
"LPC bus back to flash on "
@@ -178,7 +178,7 @@ static int poll_loop(struct mbox_context *context)
/* Best to reset windows and the lpc mapping for safety */
/* Host didn't request reset -> Notify it */
reset_all_windows(context, SET_BMC_EVENT);
- rc = reset_lpc(context);
+ rc = lpc_reset(context);
/* Not much we can do if this fails */
if (rc < 0) {
MSG_ERR("WARNING: Failed to point the LPC bus back to flash\n"
@@ -384,7 +384,7 @@ int main(int argc, char **argv)
#endif
/* Set the LPC bus mapping */
- rc = reset_lpc(context);
+ rc = lpc_reset(context);
if (rc) {
MSG_ERR("LPC configuration failed, RESET required: %d\n", rc);
}
diff --git a/mboxd_msg.c b/mboxd_msg.c
index e7c701f..5d92960 100644
--- a/mboxd_msg.c
+++ b/mboxd_msg.c
@@ -124,7 +124,7 @@ int mbox_handle_reset(struct mbox_context *context,
{
/* Host requested it -> No BMC Event */
reset_all_windows(context, NO_BMC_EVENT);
- return reset_lpc(context);
+ return lpc_reset(context);
}
/*
diff --git a/vpnor/lpc_reset.cpp b/vpnor/lpc_reset.cpp
index 588def7..3874b5e 100644
--- a/vpnor/lpc_reset.cpp
+++ b/vpnor/lpc_reset.cpp
@@ -25,12 +25,12 @@ extern "C" {
#include "mboxd_pnor_partition_table.h"
/*
- * reset_lpc() - Reset the lpc bus mapping
+ * lpc_reset() - Reset the lpc bus mapping
* @context: The mbox context pointer
*
* Return 0 on success otherwise negative error code
*/
-int reset_lpc(struct mbox_context *context)
+int lpc_reset(struct mbox_context *context)
{
int rc;
OpenPOWER on IntegriCloud