Merge branch '2023-02-07-Kconfig-cleanup-dead-code-removal'

To quote the author:
This series adds source scanning to moveconfig.py so that it can look
for Kconfig options mentioned in the source which do not appear in
Kconfig, and vice versa.

This tool is then used to clean up the unused or obsolete options
mentioned in Makefiles, along with any attached source code.

1 files changed, 1 insertions, 42 deletions

diff --git a/arch/mips/mach-octeon/octeon_fdt.c b/arch/mips/mach-octeon/octeon_fdt.c
index 0ccfe149dcc..c74fe9d9fb8 100644
--- a/arch/mips/mach-octeon/octeon_fdt.c
+++ b/arch/mips/mach-octeon/octeon_fdt.c
@@ -30,9 +30,6 @@
 #ifdef CONFIG_PCF857X
 #include <pcf857x.h>
 #endif
-#ifdef CONFIG_PCA9698
-#include <pca9698.h>
-#endif
 #ifdef CONFIG_PCA9554
 #include <pca9554.h>
 #endif
@@ -59,13 +56,6 @@ static const char * const pca9555_gpio_list[] = {
 };
 #endif
 
-#ifdef CONFIG_PCA9698
-/** List of compatible strings supported by pca9698 driver */
-static const char * const pca9698_gpio_list[] = {
-	"nxp,pca9505", "pca9505", "nxp,pca9698", "pca9698", NULL,
-};
-#endif
-
 #ifdef CONFIG_PCA953X
 /** List of compatible strings supported by pca953x driver */
 static const char * const pca953x_gpio_list[] = {
@@ -808,19 +798,6 @@ int octeon_fdt_read_gpio(const void *fdt, int phandle, int pin)
 		value = (value >> pin) & 1;
 		break;
 #endif
-#ifdef CONFIG_PCA9698
-	case CVMX_GPIO_PIN_PCA9698:
-		node = fdt_node_offset_by_phandle(fdt, phandle);
-		if (octeon_fdt_get_i2c_bus_addr(fdt, node, &bus, &addr)) {
-			printf("%s: Could not get gpio bus and/or address\n", __func__);
-			return -1;
-		}
-		old_bus = i2c_get_bus_num();
-		i2c_set_bus_num(bus);
-		value = pca9698_get_value(addr, pin);
-		i2c_set_bus_num(old_bus);
-		break;
-#endif
 	case CVMX_GPIO_PIN_OCTEON:
 		value = gpio_get_value(pin);
 		break;
@@ -881,18 +858,6 @@ int octeon_fdt_set_gpio(const void *fdt, int phandle, int pin, int val)
 		}
 		return pcf957x_set_val(bus, addr, 1 << pin, val << pin);
 #endif
-#ifdef CONFIG_PCA9698
-	case CVMX_GPIO_PIN_PCA9698:
-		if (octeon_fdt_get_i2c_bus_addr(fdt, node, &bus, &addr)) {
-			printf("%s: Could not get gpio bus and/or address\n", __func__);
-			return -1;
-		}
-		old_bus = i2c_get_bus_num();
-		i2c_set_bus_num(bus);
-		rc = pca9698_set_value(addr, pin, val);
-		i2c_set_bus_num(old_bus);
-		return rc;
-#endif
 	case CVMX_GPIO_PIN_OCTEON:
 		return gpio_set_value(pin, val);
 	default:
@@ -951,13 +916,7 @@ int octeon_fdt_get_gpio_info(int fdt_node, enum octeon_gpio_type *type,
 		*type = GPIO_TYPE_PCA953X;
 	}
 #endif
-#ifdef CONFIG_PCA9698
-	if (!octeon_fdt_node_check_compatible(fdt, fdt_node, pca9698_gpio_list)) {
-		debug("%s: Found PCA9698 compatible GPIO", __func__);
-		*type = GPIO_TYPE_PCA9698;
-	}
-#endif
-#if defined(CONFIG_PCA953X) || defined(CONFIG_PCA9698) || \
+#if defined(CONFIG_PCA953X) || \
 	defined(CONFIG_PCA9555) || defined(CONFIG_PCA9554)
 	if (!i2c_addr || !i2c_bus) {
 		printf("%s: Error: i2c_addr or i2c_bus is NULL\n", __func__);