diff --git a/drivers/hwmon/max16065.c b/drivers/hwmon/max16065.c
index b4c519e52fff..072f22f85dc0 100644
--- a/drivers/hwmon/max16065.c
+++ b/drivers/hwmon/max16065.c
@@ -79,7 +79,7 @@ static const bool max16065_have_current[] = {
 };
 
 struct max16065_data {
-	enum chips chip;
+	enum chips type;
 	struct i2c_client *client;
 	const struct attribute_group *groups[4];
 	struct mutex update_lock;
@@ -162,17 +162,10 @@ static struct max16065_data *max16065_update_device(struct device *dev)
 						     MAX16065_CURR_SENSE);
 		}
 
-		for (i = 0; i < 2; i++)
+		for (i = 0; i < DIV_ROUND_UP(data->num_adc, 8); i++)
 			data->fault[i]
 			  = i2c_smbus_read_byte_data(client, MAX16065_FAULT(i));
 
-		/*
-		 * MAX16067 and MAX16068 have separate undervoltage and
-		 * overvoltage alarm bits. Squash them together.
-		 */
-		if (data->chip == max16067 || data->chip == max16068)
-			data->fault[0] |= data->fault[1];
-
 		data->last_updated = jiffies;
 		data->valid = 1;
 	}
@@ -521,7 +514,6 @@ static int max16065_probe(struct i2c_client *client)
 	if (unlikely(!data))
 		return -ENOMEM;
 
-	data->chip = chip;
 	data->client = client;
 	mutex_init(&data->update_lock);