From 1679faaa0ef7d093fa2988b10cf25b28b48a9ddb Mon Sep 17 00:00:00 2001
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Date: Fri, 24 Mar 2023 15:24:25 +0200
Subject: [PATCH] smbus: Move smbus_utils.h from includes to driver area

Move smbus_utils.h header from generic includes to the driver's area
in order to have in include/zephyr/drivers only smbus.h header.

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
 drivers/smbus/intel_pch_smbus.c                         | 2 +-
 {include/zephyr/drivers => drivers/smbus}/smbus_utils.h | 0
 tests/drivers/smbus/smbus_api/CMakeLists.txt            | 1 +
 tests/drivers/smbus/smbus_api/src/test_smbus.c          | 3 ++-
 4 files changed, 4 insertions(+), 2 deletions(-)
 rename {include/zephyr/drivers => drivers/smbus}/smbus_utils.h (100%)

diff --git a/drivers/smbus/intel_pch_smbus.c b/drivers/smbus/intel_pch_smbus.c
index 2bc05ce5c63..79ab10081f8 100644
--- a/drivers/smbus/intel_pch_smbus.c
+++ b/drivers/smbus/intel_pch_smbus.c
@@ -21,7 +21,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(intel_pch, CONFIG_SMBUS_LOG_LEVEL);
 
-#include <zephyr/drivers/smbus_utils.h>
+#include "smbus_utils.h"
 #include "intel_pch_smbus.h"
 
 /**
diff --git a/include/zephyr/drivers/smbus_utils.h b/drivers/smbus/smbus_utils.h
similarity index 100%
rename from include/zephyr/drivers/smbus_utils.h
rename to drivers/smbus/smbus_utils.h
diff --git a/tests/drivers/smbus/smbus_api/CMakeLists.txt b/tests/drivers/smbus/smbus_api/CMakeLists.txt
index 80e2b78c362..4fee1741161 100644
--- a/tests/drivers/smbus/smbus_api/CMakeLists.txt
+++ b/tests/drivers/smbus/smbus_api/CMakeLists.txt
@@ -6,6 +6,7 @@ if(BOARD STREQUAL qemu_x86_64)
 	LIST(APPEND QEMU_EXTRA_FLAGS -machine q35)
 endif()
 
+target_include_directories(app PRIVATE ${ZEPHYR_BASE}/drivers/smbus)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(smbus_api)
 
diff --git a/tests/drivers/smbus/smbus_api/src/test_smbus.c b/tests/drivers/smbus/smbus_api/src/test_smbus.c
index 57bf23dff22..5642bd664a6 100644
--- a/tests/drivers/smbus/smbus_api/src/test_smbus.c
+++ b/tests/drivers/smbus/smbus_api/src/test_smbus.c
@@ -11,7 +11,8 @@
 #include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/drivers/smbus.h>
-#include <zephyr/drivers/smbus_utils.h>
+
+#include <smbus_utils.h>
 
 BUILD_ASSERT(DT_NODE_HAS_STATUS(DT_NODELABEL(smbus0), okay),
 	     "SMBus node is disabled!");