[PATCH v2 02/11] hwmon: (pmbus/ibm-cffps) Remove use of i2c_match_id()

Andrew Davis
2026-03-06T17:16:59Z

This helper has another benefit:
* It also checks for device match data, which allows for OF based
probing. That means we do not have to manually check those first
and can remove that check.

As i2c_get_match_data() return NULL/0 on failure which also matches
the enum for "cffps1", switch around the enum order so cffps_unknown
is index 0 and existing behavior is preserved.

Signed-off-by: Andrew Davis <afd@ti.com>
---
drivers/hwmon/pmbus/ibm-cffps.c | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/drivers/hwmon/pmbus/ibm-cffps.c b/drivers/hwmon/pmbus/ibm-cffps.c
index d05ef7a968a96..6c7256d997f46 100644
--- a/drivers/hwmon/pmbus/ibm-cffps.c
+++ b/drivers/hwmon/pmbus/ibm-cffps.c
@@ -58,7 +58,7 @@ enum {
CFFPS_DEBUGFS_NUM_ENTRIES
};

-enum versions { cffps1, cffps2, cffps_unknown };
+enum versions { cffps_unknown, cffps1, cffps2 };

struct ibm_cffps {
enum versions version;
@@ -482,19 +482,9 @@ MODULE_DEVICE_TABLE(i2c, ibm_cffps_id);
static int ibm_cffps_probe(struct i2c_client *client)
{
int i, rc;
- enum versions vs = cffps_unknown;
+ enum versions vs = (uintptr_t)i2c_get_match_data(client);
struct dentry *debugfs;
struct ibm_cffps *psu;
- const void *md = of_device_get_match_data(&client->dev);
- const struct i2c_device_id *id;
-
- if (md) {
- vs = (uintptr_t)md;
- } else {
- id = i2c_match_id(ibm_cffps_id, client);
- if (id)
- vs = (enum versions)id->driver_data;
- }

if (vs == cffps_unknown) {
u16 ccin_revision = 0;
@@ -534,7 +524,7 @@ static int ibm_cffps_probe(struct i2c_client *client)
}

/* Set the client name to include the version number. */
- snprintf(client->name, I2C_NAME_SIZE, "cffps%d", vs + 1);
+ snprintf(client->name, I2C_NAME_SIZE, "cffps%d", vs);
}

client->dev.platform_data = &ibm_cffps_pdata;
--
2.39.2