From 9fe18e05b4bc577cea96cec064d17e2e4771ae39 Mon Sep 17 00:00:00 2001
From: Declan Snyder <declan.snyder@nxp.com>
Date: Tue, 30 Aug 2022 10:09:13 -0500
Subject: [PATCH] sd: Changed Init Header Structure

In sd subsystem, made one header for all the init functions
instead of having a bunch of header files with one function.

Signed-off-by: Declan Snyder <declan.snyder@nxp.com>
---
 subsys/sd/sd.c                        |  4 +---
 subsys/sd/{sdmmc_priv.h => sd_init.h} |  9 +++++----
 subsys/sd/sdio_priv.h                 | 16 ----------------
 3 files changed, 6 insertions(+), 23 deletions(-)
 rename subsys/sd/{sdmmc_priv.h => sd_init.h} (51%)
 delete mode 100644 subsys/sd/sdio_priv.h

diff --git a/subsys/sd/sd.c b/subsys/sd/sd.c
index 839d1d1124f..494cf5cec8f 100644
--- a/subsys/sd/sd.c
+++ b/subsys/sd/sd.c
@@ -13,9 +13,7 @@
 #include <zephyr/sys/__assert.h>
 
 #include "sd_utils.h"
-#include "sdmmc_priv.h"
-#include "sdio_priv.h"
-
+#include "sd_init.h"
 
 LOG_MODULE_REGISTER(sd, CONFIG_SD_LOG_LEVEL);
 
diff --git a/subsys/sd/sdmmc_priv.h b/subsys/sd/sd_init.h
similarity index 51%
rename from subsys/sd/sdmmc_priv.h
rename to subsys/sd/sd_init.h
index 90e45527b50..481f0183754 100644
--- a/subsys/sd/sdmmc_priv.h
+++ b/subsys/sd/sd_init.h
@@ -5,13 +5,14 @@
  */
 
 
-#ifndef ZEPHYR_SUBSYS_SD_SDMMC_PRIV_H_
-#define ZEPHYR_SUBSYS_SD_SDMMC_PRIV_H_
+#ifndef ZEPHYR_SUBSYS_SD_INIT_PRIV_H_
+#define ZEPHYR_SUBSYS_SD_INIT_PRIV_H_
 
 #include <zephyr/kernel.h>
 #include <zephyr/sd/sd.h>
 
+int sdio_card_init(struct sd_card *card);
+
 int sdmmc_card_init(struct sd_card *card);
 
-
-#endif /* ZEPHYR_SUBSYS_SD_SDMMC_PRIV_H_ */
+#endif /* ZEPHYR_SUBSYS_SD_INIT_PRIV_H_ */
diff --git a/subsys/sd/sdio_priv.h b/subsys/sd/sdio_priv.h
deleted file mode 100644
index ce646d53054..00000000000
--- a/subsys/sd/sdio_priv.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright 2022 NXP
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-#ifndef ZEPHYR_SUBSYS_SD_SDIO_PRIV_H_
-#define ZEPHYR_SUBSYS_SD_SDIO_PRIV_H_
-
-#include <zephyr/zephyr.h>
-#include <zephyr/sd/sd.h>
-
-int sdio_card_init(struct sd_card *card);
-
-#endif /* ZEPHYR_SUBSYS_SD_SDIO_PRIV_H_ */