From 769d52ef0f04812fd65ef2f3ab921ad2e8562ab1 Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Fri, 17 Jun 2016 09:43:56 -0600
Subject: [PATCH] mailbox: rename headers

Rename mailbox*.h to match the naming convention requested during review
of the new reset subsystem.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
---
 drivers/mailbox/mailbox-uclass.c               | 4 ++--
 drivers/mailbox/sandbox-mbox-test.c            | 2 +-
 drivers/mailbox/sandbox-mbox.c                 | 2 +-
 include/{mailbox_uclass.h => mailbox-uclass.h} | 4 ++--
 include/{mailbox_client.h => mailbox.h}        | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename include/{mailbox_uclass.h => mailbox-uclass.h} (96%)
 rename include/{mailbox_client.h => mailbox.h} (98%)

diff --git a/drivers/mailbox/mailbox-uclass.c b/drivers/mailbox/mailbox-uclass.c
index 73fa32874a..40f851d915 100644
--- a/drivers/mailbox/mailbox-uclass.c
+++ b/drivers/mailbox/mailbox-uclass.c
@@ -7,8 +7,8 @@
 #include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
-#include <mailbox_client.h>
-#include <mailbox_uclass.h>
+#include <mailbox.h>
+#include <mailbox-uclass.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mailbox/sandbox-mbox-test.c b/drivers/mailbox/sandbox-mbox-test.c
index 02d161aada..8351522bd4 100644
--- a/drivers/mailbox/sandbox-mbox-test.c
+++ b/drivers/mailbox/sandbox-mbox-test.c
@@ -6,7 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
-#include <mailbox_client.h>
+#include <mailbox.h>
 #include <asm/io.h>
 
 struct sandbox_mbox_test {
diff --git a/drivers/mailbox/sandbox-mbox.c b/drivers/mailbox/sandbox-mbox.c
index 1b7ac231cb..530c62c029 100644
--- a/drivers/mailbox/sandbox-mbox.c
+++ b/drivers/mailbox/sandbox-mbox.c
@@ -6,7 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
-#include <mailbox_uclass.h>
+#include <mailbox-uclass.h>
 #include <asm/io.h>
 #include <asm/mbox.h>
 
diff --git a/include/mailbox_uclass.h b/include/mailbox-uclass.h
similarity index 96%
rename from include/mailbox_uclass.h
rename to include/mailbox-uclass.h
index 6a2994c34c..6ec62e5a0e 100644
--- a/include/mailbox_uclass.h
+++ b/include/mailbox-uclass.h
@@ -7,9 +7,9 @@
 #ifndef _MAILBOX_UCLASS_H
 #define _MAILBOX_UCLASS_H
 
-/* See mailbox_client.h for background documentation. */
+/* See mailbox.h for background documentation. */
 
-#include <mailbox_client.h>
+#include <mailbox.h>
 
 struct udevice;
 
diff --git a/include/mailbox_client.h b/include/mailbox.h
similarity index 98%
rename from include/mailbox_client.h
rename to include/mailbox.h
index 8345ea0bf1..a92a1a590d 100644
--- a/include/mailbox_client.h
+++ b/include/mailbox.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: GPL-2.0
  */
 
-#ifndef _MAILBOX_CLIENT_H
-#define _MAILBOX_CLIENT_H
+#ifndef _MAILBOX_H
+#define _MAILBOX_H
 
 /**
  * A mailbox is a hardware mechanism for transferring small fixed-size messages
@@ -26,7 +26,7 @@
  *
  * A driver that implements UCLASS_MAILBOX is a mailbox provider. A provider
  * will often implement multiple separate mailbox channels, since the hardware
- * it manages often has this capability. mailbox_uclass.h describes the
+ * it manages often has this capability. mailbox-uclass.h describes the
  * interface which mailbox providers must implement.
  *
  * Mailbox consumers/clients generate and send, or receive and process,
-- 
2.25.1