From deced0717aee16af24a8dbbf8fa7be77ba900fdd Mon Sep 17 00:00:00 2001
From: Sean Cross <xobs@kosagi.com>
Date: Tue, 7 Apr 2015 17:56:44 +0800
Subject: [PATCH] Revert "Silenced GCC warnings"

This reverts commit 11ac2200ff0e889f07e74dd175604538df5c2b98.
---
 cmd-peekpoke.c      | 6 +-----
 fernly-usb-loader.c | 3 ---
 irq.c               | 7 +------
 lcd.c               | 2 +-
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/cmd-peekpoke.c b/cmd-peekpoke.c
index 9fac9ae..2f582dc 100644
--- a/cmd-peekpoke.c
+++ b/cmd-peekpoke.c
@@ -15,10 +15,8 @@ int cmd_peek(int argc, char **argv)
 
 	offset = strtoul(argv[0], NULL, 0);
 
-#pragma GCC diagnostic ignored "-Wformat"
 	printf("Value at 0x%08x: ", offset);
 	printf("0x%08x\n", *((volatile uint32_t *)offset));
-#pragma GCC diagnostic pop
 	return 0;
 }
 
@@ -35,10 +33,8 @@ int cmd_poke(int argc, char **argv)
 	offset = strtoul(argv[0], NULL, 0);
 	val = strtoul(argv[1], NULL, 0);
 
-#pragma GCC diagnostic ignored "-Wformat"
 	printf("Setting value at 0x%08x to 0x%08x: ", offset, val);
-#pragma GCC diagnostic pop
-    writel(val, offset);
+	writel(val, offset);
 	printf("Ok\n");
 
 	return 0;
diff --git a/fernly-usb-loader.c b/fernly-usb-loader.c
index e682398..c12bac7 100644
--- a/fernly-usb-loader.c
+++ b/fernly-usb-loader.c
@@ -1175,10 +1175,7 @@ static int fernvale_write_stage3(int serfd, int binfd)
 }
 
 static void cmd_begin(const char *msg) {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-security"
 	printf(msg);
-#pragma GCC diagnostic pop
 	printf("... ");
 	fflush(stdout);
 }
diff --git a/irq.c b/irq.c
index 6917150..06687b8 100644
--- a/irq.c
+++ b/irq.c
@@ -130,9 +130,7 @@ void irq_dispatch(void)
 	printf("Dispatching IRQs...\n");
 	reg = IRQ_BASE + IRQ_STATUS_OFF;
 	val = readl(reg);
-#pragma GCC diagnostic ignored "-Wformat"
 	printf("Lower Mask: 0x%08x\n", val);
-#pragma GCC diagnostic pop
 
 	for (i = 0; i < 32; i++)
 		if (val & (1 << i))
@@ -140,10 +138,7 @@ void irq_dispatch(void)
 
 	reg += IRQ_BASE + IRQ_STATUS_OFF + 4;
 	val = readl(reg);
-#pragma GCC diagnostic ignored "-Wformat"
-    printf("Upper Mask: 0x%08x\n", val);
-#pragma GCC diagnostic pop
-
+	printf("Upper Mask: 0x%08x\n", val);
 	for (i = 0; i < (__irq_max__ - 32); i++)
 		if (val & (1 << i))
 			irq_dispatch_one(32 + i);
diff --git a/lcd.c b/lcd.c
index 77f6c11..7a44965 100644
--- a/lcd.c
+++ b/lcd.c
@@ -29,11 +29,11 @@ static void lcd_cmd_slot(uint16_t cmd, uint8_t slot)
 {
 	writel(cmd | 0x800000, LCD_CMD_LIST_ADDR + (slot * 4));
 }
-#pragma GCC diagnostic ignored "-Wunused-function"
 static void lcd_dat_slot(uint16_t dat, uint8_t slot)
 {
 	writel(dat, LCD_CMD_LIST_ADDR + (slot * 4));
 }
+
 static void lcd_setup_gpio(void)
 {
 	/* LPCE0, LPTE0, LPRSTB */