From a809f2cfb556460a7e731567e50953ba012a526f Mon Sep 17 00:00:00 2001
From: Jon Hunter <jonathanh@nvidia.com>
Date: Tue, 25 Apr 2023 15:13:15 +0100
Subject: [PATCH] i2c: nvvrs11: Remove header file

The header file for the NVIDIA I2C NVRS11 driver is only used by this
driver and so remove the header and include the necessary definitions in
the driver source. This avoids having to distribute a header file along
with the main source file.

Bug 4008099

Change-Id: I7ff0e426e74810e34e94ee9ffa28923f40485715
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2893965
(cherry picked from commit 6e467aeef7848ad55b55b176b89c7fd14c34586d)
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2894562
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com>
Reviewed-by: Shubhi Garg <shgarg@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
---
 drivers/i2c/busses/i2c-nvvrs11.c | 26 +++++++++++++++++++++-
 include/linux/i2c-nvvrs11.h      | 37 --------------------------------
 2 files changed, 25 insertions(+), 38 deletions(-)
 delete mode 100644 include/linux/i2c-nvvrs11.h

diff --git a/drivers/i2c/busses/i2c-nvvrs11.c b/drivers/i2c/busses/i2c-nvvrs11.c
index bdf30f6a..ec5a9899 100644
--- a/drivers/i2c/busses/i2c-nvvrs11.c
+++ b/drivers/i2c/busses/i2c-nvvrs11.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/i2c.h>
-#include <linux/i2c-nvvrs11.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/of.h>
@@ -14,11 +13,36 @@
 #include <linux/regmap.h>
 #include <linux/slab.h>
 #include <linux/err.h>
+#include <linux/types.h>
 #include <linux/version.h>
 
 #define VOLTAGE_OFFSET		200 // 0.2V
 #define VOLTAGE_SCALE		5   // 5mV
 
+/* Vendor ID */
+#define NVVRS11_REG_VENDOR_ID		0x00
+#define NVVRS11_REG_MODEL_REV		0x01
+
+/* Voltage Output registers */
+#define NVVRS11_REG_VOUT_A		0x30
+#define NVVRS11_REG_VOUT_B		0x33
+
+/* Current Output registers */
+#define NVVRS11_REG_IOUT_A		0x31
+#define NVVRS11_REG_IOUT_B		0x34
+
+/* Temperature registers */
+#define NVVRS11_REG_TEMP_A		0x32
+#define NVVRS11_REG_TEMP_B		0x35
+
+struct nvvrs11_chip {
+	struct device *dev;
+	struct regmap *rmap;
+	struct i2c_client *client;
+	const char *loopA_rail_name;
+	const char *loopB_rail_name;
+};
+
 static const struct regmap_range nvvrs11_readable_ranges[] = {
 	regmap_reg_range(NVVRS11_REG_VENDOR_ID, NVVRS11_REG_MODEL_REV),
 	regmap_reg_range(NVVRS11_REG_VOUT_A, NVVRS11_REG_TEMP_B),
diff --git a/include/linux/i2c-nvvrs11.h b/include/linux/i2c-nvvrs11.h
deleted file mode 100644
index a47ed74b..00000000
--- a/include/linux/i2c-nvvrs11.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Defining registers address and its bit definitions of NVVRS11
- *
- * Copyright (C) 2022-2023 NVIDIA CORPORATION. All rights reserved.
- */
-
-#ifndef _LINUX_I2C_NVVRS11_H_
-#define _LINUX_I2C_NVVRS11_H_
-
-#include <linux/types.h>
-
-/* Vendor ID */
-#define NVVRS11_REG_VENDOR_ID		0x00
-#define NVVRS11_REG_MODEL_REV		0x01
-
-/* Voltage Output registers */
-#define NVVRS11_REG_VOUT_A		0x30
-#define NVVRS11_REG_VOUT_B		0x33
-
-/* Current Output registers */
-#define NVVRS11_REG_IOUT_A		0x31
-#define NVVRS11_REG_IOUT_B		0x34
-
-/* Temperature registers */
-#define NVVRS11_REG_TEMP_A		0x32
-#define NVVRS11_REG_TEMP_B		0x35
-
-struct nvvrs11_chip {
-	struct device *dev;
-	struct regmap *rmap;
-	struct i2c_client *client;
-	const char *loopA_rail_name;
-	const char *loopB_rail_name;
-};
-
-#endif /* _LINUX_I2C_NVVRS11_H_ */