1 files changed, 11 insertions, 36 deletions

diff --git a/src/mainboard/google/foster/chromeos.c b/src/mainboard/google/foster/chromeos.c
index 4cf2a858c0..024fd4ce7e 100644
--- a/src/mainboard/google/foster/chromeos.c
+++ b/src/mainboard/google/foster/chromeos.c
@@ -24,46 +24,21 @@
 
 void fill_lb_gpios(struct lb_gpios *gpios)
 {
-	int count = 0;
-
 	/* TBD(twarren@nvidia.com): Any analogs for these on Foster-FFD? */
+	struct lb_gpio chromeos_gpios[] = {
+		/* Write Protect: active low */
+		{-1, ACTIVE_LOW, get_write_protect_state(), "write protect"},
 
-	/* Write Protect: active low */
-	gpios->gpios[count].port = -1;
-	gpios->gpios[count].polarity = ACTIVE_LOW;
-	gpios->gpios[count].value = get_write_protect_state();
-	strncpy((char *)gpios->gpios[count].name, "write protect",
-		GPIO_MAX_NAME_LENGTH);
-	count++;
-
-	/* Recovery: active high */
-	gpios->gpios[count].port = -1;
-	gpios->gpios[count].polarity = ACTIVE_HIGH;
-	gpios->gpios[count].value = get_recovery_mode_switch();
-	strncpy((char *)gpios->gpios[count].name, "recovery",
-		GPIO_MAX_NAME_LENGTH);
-	count++;
-
-	/* TODO: Power: active low / high depending on board id */
-	gpios->gpios[count].port = GPIO(X5);
-	gpios->gpios[count].polarity = ACTIVE_LOW;
-	gpios->gpios[count].value = -1;
-	strncpy((char *)gpios->gpios[count].name, "power",
-		GPIO_MAX_NAME_LENGTH);
-	count++;
-
-	/* TODO: Reset: active low (output) */
-	gpios->gpios[count].port = GPIO(I5);
-	gpios->gpios[count].polarity = ACTIVE_LOW;
-	gpios->gpios[count].value = -1;
-	strncpy((char *)gpios->gpios[count].name, "reset",
-		GPIO_MAX_NAME_LENGTH);
-	count++;
+		/* Recovery: active high */
+		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
 
-	gpios->size = sizeof(*gpios) + (count * sizeof(struct lb_gpio));
-	gpios->count = count;
+		/* TODO: Power: active low / high depending on board id */
+		{GPIO(X5), ACTIVE_LOW, -1, "power"},
 
-	printk(BIOS_ERR, "Added %d GPIOS size %d\n", count, gpios->size);
+		/* TODO: Reset: active low (output) */
+		{GPIO(I5), ACTIVE_LOW, -1, "reset"},
+	};
+	lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios));
 }
 
 int get_recovery_mode_switch(void)