From ac0f56f6322fc83d0fec67e20e440ea2e4f4a67d Mon Sep 17 00:00:00 2001
From: Ksawlii <ksawery.blaszczak@proton.me>
Date: Sun, 24 Nov 2024 00:23:35 +0100
Subject: [PATCH] Revert "hwmon: (pmbus) Introduce and use write_byte_data
 callback"

This reverts commit cbbc2c67475ba046792d8198e899bf5eebe128eb.
---
 drivers/hwmon/pmbus/pmbus.h      |  2 --
 drivers/hwmon/pmbus/pmbus_core.c | 24 +++---------------------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/drivers/hwmon/pmbus/pmbus.h b/drivers/hwmon/pmbus/pmbus.h
index 147306be5..de27837e8 100755
--- a/drivers/hwmon/pmbus/pmbus.h
+++ b/drivers/hwmon/pmbus/pmbus.h
@@ -438,8 +438,6 @@ struct pmbus_driver_info {
 	int (*read_byte_data)(struct i2c_client *client, int page, int reg);
 	int (*read_word_data)(struct i2c_client *client, int page, int phase,
 			      int reg);
-	int (*write_byte_data)(struct i2c_client *client, int page, int reg,
-			      u8 byte);
 	int (*write_word_data)(struct i2c_client *client, int page, int reg,
 			       u16 word);
 	int (*write_byte)(struct i2c_client *client, int page, u8 value);
diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
index a5e46d5cf..117e3ce9c 100755
--- a/drivers/hwmon/pmbus/pmbus_core.c
+++ b/drivers/hwmon/pmbus/pmbus_core.c
@@ -265,24 +265,6 @@ static int _pmbus_write_word_data(struct i2c_client *client, int page, int reg,
 	return pmbus_write_word_data(client, page, reg, word);
 }
 
-/*
- * _pmbus_write_byte_data() is similar to pmbus_write_byte_data(), but checks if
- * a device specific mapping function exists and calls it if necessary.
- */
-static int _pmbus_write_byte_data(struct i2c_client *client, int page, int reg, u8 value)
-{
-	struct pmbus_data *data = i2c_get_clientdata(client);
-	const struct pmbus_driver_info *info = data->info;
-	int status;
-
-	if (info->write_byte_data) {
-		status = info->write_byte_data(client, page, reg, value);
-		if (status != -ENODATA)
-			return status;
-	}
-	return pmbus_write_byte_data(client, page, reg, value);
-}
-
 int pmbus_update_fan(struct i2c_client *client, int page, int id,
 		     u8 config, u8 mask, u16 command)
 {
@@ -297,7 +279,7 @@ int pmbus_update_fan(struct i2c_client *client, int page, int id,
 
 	to = (from & ~mask) | (config & mask);
 	if (to != from) {
-		rv = _pmbus_write_byte_data(client, page,
+		rv = pmbus_write_byte_data(client, page,
 					   pmbus_fan_config_registers[id], to);
 		if (rv < 0)
 			return rv;
@@ -404,7 +386,7 @@ int pmbus_update_byte_data(struct i2c_client *client, int page, u8 reg,
 	tmp = (rv & ~mask) | (value & mask);
 
 	if (tmp != rv)
-		rv = _pmbus_write_byte_data(client, page, reg, tmp);
+		rv = pmbus_write_byte_data(client, page, reg, tmp);
 
 	return rv;
 }
@@ -917,7 +899,7 @@ static int pmbus_get_boolean(struct i2c_client *client, struct pmbus_boolean *b,
 
 	regval = status & mask;
 	if (regval) {
-		ret = _pmbus_write_byte_data(client, page, reg, regval);
+		ret = pmbus_write_byte_data(client, page, reg, regval);
 		if (ret)
 			goto unlock;
 	}