---

yaml
---
r: 363069
b: refs/heads/master
c: 573728c
h: refs/heads/master
i:
  363067: 056edac
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: debe597cca61aacf9e17a4dc155aa84446ab4bf0
+refs/heads/master: 573728c647fb991ec7be6408a4975413d2ace6c3

trunk/drivers/hwmon/nct6775.c

@@ -3721,43 +3721,6 @@ static int nct6775_probe(struct platform_device *pdev)
 	}
 #endif /* USE_ALTERNATE */
 
-	switch (data->kind) {
-	case nct6775:
-		break;
-	case nct6776:
-		/*
-		 * On NCT6776, AUXTIN and VIN3 pins are shared.
-		 * Only way to detect it is to check if AUXTIN is used
-		 * as a temperature source, and if that source is
-		 * enabled.
-		 *
-		 * If that is the case, disable in6, which reports VIN3.
-		 * Otherwise disable temp3.
-		 */
-		if (data->have_temp & (1 << 2)) {
-			u8 reg = nct6775_read_value(data,
-						    data->reg_temp_config[2]);
-			if (reg & 0x01)
-				data->have_temp &= ~(1 << 2);
-			else
-				data->have_in &= ~(1 << 6);
-		}
-		break;
-	case nct6779:
-		/*
-		 * Shared pins:
-		 *	VIN4 / AUXTIN0
-		 *	VIN5 / AUXTIN1
-		 *	VIN6 / AUXTIN2
-		 *	VIN7 / AUXTIN3
-		 *
-		 * There does not seem to be a clean way to detect if VINx or
-		 * AUXTINx is active, so for keep both sensor types enabled
-		 * for now.
-		 */
-		break;
-	}
-
 	/* Initialize the chip */
 	nct6775_init_device(data);