From: Andrew Davis <afd@ti.com>
To: Jean Delvare <jdelvare@suse.com>,
Guenter Roeck <linux@roeck-us.net>,
Juerg Haefliger <juergh@proton.me>,
Riku Voipio <riku.voipio@iki.fi>
Cc: <linux-hwmon@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Andrew Davis <afd@ti.com>
Subject: [PATCH 19/31] hwmon: (max16065) Remove use of i2c_match_id()
Date: Wed, 3 Apr 2024 15:36:21 -0500 [thread overview]
Message-ID: <20240403203633.914389-20-afd@ti.com> (raw)
In-Reply-To: <20240403203633.914389-1-afd@ti.com>
The function i2c_match_id() is used to fetch the matching ID from
the i2c_device_id table. This is often used to then retrieve the
matching driver_data. This can be done in one step with the helper
i2c_get_match_data().
This helper has a couple other benefits:
* It doesn't need the i2c_device_id passed in so we do not need
to have that forward declared, allowing us to remove those or
move the i2c_device_id table down to its more natural spot
with the other module info.
* It also checks for device match data, which allows for OF and
ACPI based probing. That means we do not have to manually check
those first and can remove those checks.
Signed-off-by: Andrew Davis <afd@ti.com>
---
drivers/hwmon/max16065.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/hwmon/max16065.c b/drivers/hwmon/max16065.c
index aa38c45adc09e..7ce9a89f93a0d 100644
--- a/drivers/hwmon/max16065.c
+++ b/drivers/hwmon/max16065.c
@@ -493,8 +493,6 @@ static const struct attribute_group max16065_max_group = {
.is_visible = max16065_secondary_is_visible,
};
-static const struct i2c_device_id max16065_id[];
-
static int max16065_probe(struct i2c_client *client)
{
struct i2c_adapter *adapter = client->adapter;
@@ -505,7 +503,7 @@ static int max16065_probe(struct i2c_client *client)
bool have_secondary; /* true if chip has secondary limits */
bool secondary_is_max = false; /* secondary limits reflect max */
int groups = 0;
- const struct i2c_device_id *id = i2c_match_id(max16065_id, client);
+ enum chips chip = (uintptr_t)i2c_get_match_data(client);
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA
| I2C_FUNC_SMBUS_READ_WORD_DATA))
@@ -518,9 +516,9 @@ static int max16065_probe(struct i2c_client *client)
data->client = client;
mutex_init(&data->update_lock);
- data->num_adc = max16065_num_adc[id->driver_data];
- data->have_current = max16065_have_current[id->driver_data];
- have_secondary = max16065_have_secondary[id->driver_data];
+ data->num_adc = max16065_num_adc[chip];
+ data->have_current = max16065_have_current[chip];
+ have_secondary = max16065_have_secondary[chip];
if (have_secondary) {
val = i2c_smbus_read_byte_data(client, MAX16065_SW_ENABLE);
--
2.39.2
next prev parent reply other threads:[~2024-04-03 20:37 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-03 20:36 [PATCH 00/31] Remove use of i2c_match_id in HWMON Andrew Davis
2024-04-03 20:36 ` [PATCH 01/31] hwmon: (ad7418) Remove use of i2c_match_id() Andrew Davis
2024-04-03 20:36 ` [PATCH 02/31] hwmon: (adm1021) " Andrew Davis
2024-04-03 20:36 ` [PATCH 03/31] hwmon: (adm1031) " Andrew Davis
2024-04-03 20:36 ` [PATCH 04/31] hwmon: (ads7828) " Andrew Davis
2024-04-03 20:36 ` [PATCH 05/31] hwmon: (adt7475) " Andrew Davis
2024-04-03 20:36 ` [PATCH 06/31] hwmon: (aht10) " Andrew Davis
2024-04-03 20:36 ` [PATCH 07/31] hwmon: (dme1737) " Andrew Davis
2024-04-03 20:36 ` [PATCH 08/31] hwmon: (ds1621) " Andrew Davis
2024-04-03 20:36 ` [PATCH 09/31] hwmon: (f75375s) " Andrew Davis
2024-04-03 20:36 ` [PATCH 10/31] hwmon: (fschmd) " Andrew Davis
2024-04-03 20:36 ` [PATCH 11/31] hwmon: (ina2xx) " Andrew Davis
2024-04-03 20:36 ` [PATCH 12/31] hwmon: (lm63) " Andrew Davis
2024-04-03 20:36 ` [PATCH 13/31] hwmon: (lm75) " Andrew Davis
2024-04-03 20:36 ` [PATCH 14/31] hwmon: (lm78) " Andrew Davis
2024-04-03 20:36 ` [PATCH 15/31] hwmon: (lm83) " Andrew Davis
2024-04-03 20:36 ` [PATCH 16/31] hwmon: (lm85) " Andrew Davis
2024-04-03 20:36 ` [PATCH 17/31] hwmon: (lm90) " Andrew Davis
2024-04-03 20:36 ` [PATCH 18/31] hwmon: (lm95234) " Andrew Davis
2024-04-03 20:36 ` Andrew Davis [this message]
2024-04-03 20:36 ` [PATCH 20/31] hwmon: (max1668) " Andrew Davis
2024-04-03 20:36 ` [PATCH 21/31] hwmon: (max6697) " Andrew Davis
2024-04-03 20:36 ` [PATCH 22/31] hwmon: (mcp3021) " Andrew Davis
2024-04-03 20:36 ` [PATCH 23/31] hwmon: (powr1220) " Andrew Davis
2024-04-03 20:36 ` [PATCH 24/31] hwmon: (sht3x) " Andrew Davis
2024-04-03 20:36 ` [PATCH 25/31] hwmon: (shtc1) " Andrew Davis
2024-04-03 20:36 ` [PATCH 26/31] hwmon: (thmc50) " Andrew Davis
2024-04-03 20:36 ` [PATCH 27/31] hwmon: (tmp401) " Andrew Davis
2024-04-03 20:36 ` [PATCH 28/31] hwmon: (tmp421) " Andrew Davis
2024-04-03 20:36 ` [PATCH 29/31] hwmon: (tmp464) " Andrew Davis
2024-04-03 20:36 ` [PATCH 30/31] hwmon: (w83781d) " Andrew Davis
2024-04-03 20:36 ` [PATCH 31/31] hwmon: (w83795): " Andrew Davis
2024-04-03 21:30 ` [PATCH 00/31] Remove use of i2c_match_id in HWMON Guenter Roeck
2024-04-03 22:06 ` Andrew Davis
2024-04-08 11:49 ` Guenter Roeck
2024-04-16 14:16 ` Guenter Roeck
2024-04-16 17:08 ` Andrew Davis
2024-04-18 13:42 ` Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240403203633.914389-20-afd@ti.com \
--to=afd@ti.com \
--cc=jdelvare@suse.com \
--cc=juergh@proton.me \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=riku.voipio@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.