drm/rp1/rp1_dsi: Fix GPIO probing -- TO SQUASH

Author: njhollinghurst

drivers/gpu/drm/rp1/rp1-dpi/rp1_dpi.c

@@ -305,6 +305,7 @@ static int rp1dpi_platform_probe(struct platform_device *pdev)
 	struct drm_bridge *bridge = NULL;
 	const char *rgb_order = NULL;
 	struct drm_panel *panel;
+	u32 missing_gpios;
 	int i, j, ret;
 
 	dev_info(dev, __func__);
@@ -382,8 +383,8 @@ static int rp1dpi_platform_probe(struct platform_device *pdev)
 	}
 
 	/* Check if all of GPIOs 1, 2 and 3 are assigned to DPI */
-	ret = 0;
-	for (i = 0; ret < 0xE; i++) {
+	missing_gpios = BIT(1) | BIT(2) | BIT(3);
+	for (i = 0; missing_gpios; i++) {
 		u32 p = 0;
 		const char *str = NULL;
 		struct device_node *np1 = of_parse_phandle(dev->of_node, "pinctrl-0", i);
@@ -392,26 +393,26 @@ static int rp1dpi_platform_probe(struct platform_device *pdev)
 			break;
 
 		if (!of_property_read_string(np1, "function", &str) && !strcmp(str, "dpi")) {
-			for (j = 0; ret < 0xE; j++) {
+			for (j = 0; missing_gpios; j++) {
 				if (of_property_read_string_index(np1, "pins", j, &str))
 					break;
 				if (!strcmp(str, "gpio1"))
-					ret |= BIT(1);
+					missing_gpios &= ~BIT(1);
 				else if (!strcmp(str, "gpio2"))
-					ret |= BIT(2);
+					missing_gpios &= ~BIT(2);
 				else if (!strcmp(str, "gpio3"))
-					ret |= BIT(3);
+					missing_gpios &= ~BIT(3);
 			}
-			for (j = 0; ret < 3; j++) {
+			for (j = 0; missing_gpios; j++) {
 				if (of_property_read_u32_index(np1, "brcm,pins", j, &p))
 					break;
-				if (p >= 1 && p <= 3)
-					ret |= (1 << p);
+				if (p < 32)
+					missing_gpios &= ~(1 << p);
 			}
 		}
 		of_node_put(np1);
 	}
-	dpi->sync_gpios_mapped = (ret >= 0xE);
+	dpi->sync_gpios_mapped = !missing_gpios;
 
 	/* Now we have all our resources, finish driver initialization */
 	dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));