Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "hwmon: (max16065) Remove use of i2c_match_id()"

Browse source 
This reverts commit ab798c7873.
This commit is contained in:
Ksawlii 2024-11-24 00:23:27 +01:00
parent a420691e36
commit b04ccf5481
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/hwmon/max16065.c
View file

@ -494,6 +494,8 @@ static const struct attribute_group max16065_max_group = {
.is_visible = max16065_secondary_is_visible, .is_visible = max16065_secondary_is_visible,
}; };
static const struct i2c_device_id max16065_id[];
static int max16065_probe(struct i2c_client *client) static int max16065_probe(struct i2c_client *client)
{ {
struct i2c_adapter *adapter = client->adapter; struct i2c_adapter *adapter = client->adapter;
@ -504,7 +506,7 @@ static int max16065_probe(struct i2c_client *client)
bool have_secondary; /* true if chip has secondary limits */ bool have_secondary; /* true if chip has secondary limits */
bool secondary_is_max = false; /* secondary limits reflect max */ bool secondary_is_max = false; /* secondary limits reflect max */
int groups = 0; int groups = 0;
enum chips chip = (uintptr_t)i2c_get_match_data(client); const struct i2c_device_id *id = i2c_match_id(max16065_id, client);
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA
| I2C_FUNC_SMBUS_READ_WORD_DATA)) | I2C_FUNC_SMBUS_READ_WORD_DATA))
@ -517,9 +519,9 @@ static int max16065_probe(struct i2c_client *client)
data->client = client; data->client = client;
mutex_init(&data->update_lock); mutex_init(&data->update_lock);
data->num_adc = max16065_num_adc[chip]; data->num_adc = max16065_num_adc[id->driver_data];
data->have_current = max16065_have_current[chip]; data->have_current = max16065_have_current[id->driver_data];
have_secondary = max16065_have_secondary[chip]; have_secondary = max16065_have_secondary[id->driver_data];
if (have_secondary) { if (have_secondary) {
val = i2c_smbus_read_byte_data(client, MAX16065_SW_ENABLE); val = i2c_smbus_read_byte_data(client, MAX16065_SW_ENABLE);