[Skiboot] [RFC PATCH v2 4/4] Remove redundant includes of opal-api.h

Michael Ellerman mpe at ellerman.id.au
Tue Mar 31 21:53:20 AEDT 2015 

Now that opal.h includes opal-api.h, there are a bunch of files that
include both but don't need to.

Signed-off-by: Michael Ellerman <mpe at ellerman.id.au>
---

v2: New.

 core/affinity.c         | 1 -
 core/console.c          | 1 -
 core/cpu.c              | 1 -
 core/exceptions.c       | 1 -
 core/flash.c            | 1 -
 core/hmi.c              | 1 -
 core/i2c.c              | 1 -
 core/init.c             | 1 -
 core/interrupts.c       | 1 -
 core/ipmi.c             | 1 -
 core/nvram.c            | 1 -
 core/opal.c             | 1 -
 core/platform.c         | 1 -
 core/sensor.c           | 1 -
 core/timebase.c         | 1 -
 core/timer.c            | 1 -
 hw/fake-rtc.c           | 1 -
 hw/fsp/fsp-console.c    | 1 -
 hw/fsp/fsp-dpo.c        | 1 -
 hw/fsp/fsp-epow.c       | 1 -
 hw/fsp/fsp-leds.c       | 1 -
 hw/fsp/fsp-mdst-table.c | 1 -
 hw/fsp/fsp-nvram.c      | 1 -
 hw/fsp/fsp-op-panel.c   | 1 -
 hw/fsp/fsp-sysparam.c   | 1 -
 hw/fsp/fsp.c            | 1 -
 hw/ipmi/ipmi-opal.c     | 1 -
 hw/ipmi/ipmi-rtc.c      | 1 -
 hw/lpc-uart.c           | 1 -
 hw/p7ioc-phb.c          | 1 -
 hw/p7ioc.c              | 1 -
 hw/phb3.c               | 1 -
 hw/prd.c                | 1 -
 hw/psi.c                | 1 -
 34 files changed, 34 deletions(-)

diff --git a/core/affinity.c b/core/affinity.c
index fe364a281a96..d5eea8298e92 100644
--- a/core/affinity.c
+++ b/core/affinity.c
@@ -45,7 +45,6 @@
  */
 #include <skiboot.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <device.h>
 #include <console.h>
 #include <trace.h>
diff --git a/core/console.c b/core/console.c
index 3a607d055924..bc8eed80f3b8 100644
--- a/core/console.c
+++ b/core/console.c
@@ -23,7 +23,6 @@
 #include <unistd.h>
 #include <console.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <device.h>
 #include <processor.h>
 #include <cpu.h>
diff --git a/core/cpu.c b/core/cpu.c
index 1b157d84a721..8f684d240a35 100644
--- a/core/cpu.c
+++ b/core/cpu.c
@@ -22,7 +22,6 @@
 #include <cpu.h>
 #include <device.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <stack.h>
 #include <trace.h>
 #include <affinity.h>
diff --git a/core/exceptions.c b/core/exceptions.c
index 841619015f84..fbbc0e86f4f7 100644
--- a/core/exceptions.c
+++ b/core/exceptions.c
@@ -17,7 +17,6 @@
 #include <skiboot.h>
 #include <stack.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <processor.h>
 #include <cpu.h>
 
diff --git a/core/flash.c b/core/flash.c
index 85ceaaab780b..7d32c8d4776d 100644
--- a/core/flash.c
+++ b/core/flash.c
@@ -18,7 +18,6 @@
 #include <lock.h>
 #include <opal.h>
 #include <opal-msg.h>
-#include <opal-api.h>
 #include <device.h>
 #include <libflash/libflash.h>
 #include <libflash/libffs.h>
diff --git a/core/hmi.c b/core/hmi.c
index 32155f4f0515..0b9c7fbf75d9 100644
--- a/core/hmi.c
+++ b/core/hmi.c
@@ -15,7 +15,6 @@
  */
 #include <skiboot.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <opal-msg.h>
 #include <processor.h>
 #include <chiptod.h>
diff --git a/core/i2c.c b/core/i2c.c
index 26149daab224..e0af9b2ae6e8 100644
--- a/core/i2c.c
+++ b/core/i2c.c
@@ -17,7 +17,6 @@
 #include <skiboot.h>
 #include <i2c.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <device.h>
 #include <opal-msg.h>
 
diff --git a/core/init.c b/core/init.c
index 1ed75011333d..8d2a8559ce4a 100644
--- a/core/init.c
+++ b/core/init.c
@@ -25,7 +25,6 @@
 #include <xscom.h>
 #include <device_tree.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <opal-msg.h>
 #include <elf.h>
 #include <io.h>
diff --git a/core/interrupts.c b/core/interrupts.c
index e3a4151b2f70..9d7966055be6 100644
--- a/core/interrupts.c
+++ b/core/interrupts.c
@@ -19,7 +19,6 @@
 #include <fsp.h>
 #include <interrupts.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <io.h>
 #include <cec.h>
 #include <device.h>
diff --git a/core/ipmi.c b/core/ipmi.c
index 78a54dea14c4..2f9110133fae 100644
--- a/core/ipmi.c
+++ b/core/ipmi.c
@@ -19,7 +19,6 @@
 #include <bt.h>
 #include <ipmi.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <device.h>
 #include <skiboot.h>
 #include <lock.h>
diff --git a/core/nvram.c b/core/nvram.c
index 0dce4fcd74ee..f25d6aa66424 100644
--- a/core/nvram.c
+++ b/core/nvram.c
@@ -17,7 +17,6 @@
 #include <skiboot.h>
 #include <fsp.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <lock.h>
 #include <device.h>
 #include <platform.h>
diff --git a/core/opal.c b/core/opal.c
index 5e96e0a31cea..45ee2e2ffa69 100644
--- a/core/opal.c
+++ b/core/opal.c
@@ -16,7 +16,6 @@
 
 #include <skiboot.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <stack.h>
 #include <lock.h>
 #include <fsp.h>
diff --git a/core/platform.c b/core/platform.c
index f93b141860cb..3fe8b8538a07 100644
--- a/core/platform.c
+++ b/core/platform.c
@@ -17,7 +17,6 @@
 
 #include <skiboot.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <console.h>
 #include <timebase.h>
 #include <cpu.h>
diff --git a/core/sensor.c b/core/sensor.c
index 41194248e264..2b3957a9498e 100644
--- a/core/sensor.c
+++ b/core/sensor.c
@@ -19,7 +19,6 @@
 #include <skiboot.h>
 #include <device.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <dts.h>
 
 struct dt_node *sensor_node;
diff --git a/core/timebase.c b/core/timebase.c
index ce2784ae8621..b1d8196715fe 100644
--- a/core/timebase.c
+++ b/core/timebase.c
@@ -17,7 +17,6 @@
 
 #include <timebase.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <cpu.h>
 
 static void time_wait_poll(unsigned long duration)
diff --git a/core/timer.c b/core/timer.c
index 81ee5b9ad336..737fb780bc8e 100644
--- a/core/timer.c
+++ b/core/timer.c
@@ -4,7 +4,6 @@
 #include <fsp.h>
 #include <device.h>
 #include <opal.h>
-#include <opal-api.h>
 
 #ifdef __TEST__
 #define this_cpu()	((void *)-1)
diff --git a/hw/fake-rtc.c b/hw/fake-rtc.c
index 538f59de2a05..1b7c473d0b90 100644
--- a/hw/fake-rtc.c
+++ b/hw/fake-rtc.c
@@ -16,7 +16,6 @@
 
 #include <skiboot.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <mem_region.h>
 
 static uint32_t *fake_ymd;
diff --git a/hw/fsp/fsp-console.c b/hw/fsp/fsp-console.c
index 554dbde8d512..c1195f2b3233 100644
--- a/hw/fsp/fsp-console.c
+++ b/hw/fsp/fsp-console.c
@@ -23,7 +23,6 @@
 #include <fsp.h>
 #include <console.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <timebase.h>
 #include <device.h>
 #include <fsp-sysparam.h>
diff --git a/hw/fsp/fsp-dpo.c b/hw/fsp/fsp-dpo.c
index 4ec2bbb8627f..d8181205893f 100644
--- a/hw/fsp/fsp-dpo.c
+++ b/hw/fsp/fsp-dpo.c
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <timebase.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <opal-msg.h>
 
 #define PREFIX "FSPDPO: "
diff --git a/hw/fsp/fsp-epow.c b/hw/fsp/fsp-epow.c
index ed91c15a726c..eaba8bbbbe74 100644
--- a/hw/fsp/fsp-epow.c
+++ b/hw/fsp/fsp-epow.c
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <spcn.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <opal-msg.h>
 
 #include "fsp-epow.h"
diff --git a/hw/fsp/fsp-leds.c b/hw/fsp/fsp-leds.c
index c9dc70a8a1bf..cbb0817061c5 100644
--- a/hw/fsp/fsp-leds.c
+++ b/hw/fsp/fsp-leds.c
@@ -24,7 +24,6 @@
 #include <spcn.h>
 #include <lock.h>
 #include <errorlog.h>
-#include <opal-api.h>
 #include <opal.h>
 #include <opal-msg.h>
 
diff --git a/hw/fsp/fsp-mdst-table.c b/hw/fsp/fsp-mdst-table.c
index f27c1b38640e..f6abc4bfe705 100644
--- a/hw/fsp/fsp-mdst-table.c
+++ b/hw/fsp/fsp-mdst-table.c
@@ -29,7 +29,6 @@
 #include <fsp.h>
 #include <psi.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <lock.h>
 #include <skiboot.h>
 #include <errorlog.h>
diff --git a/hw/fsp/fsp-nvram.c b/hw/fsp/fsp-nvram.c
index 87a774a50346..257cdd63c63b 100644
--- a/hw/fsp/fsp-nvram.c
+++ b/hw/fsp/fsp-nvram.c
@@ -17,7 +17,6 @@
 #include <skiboot.h>
 #include <fsp.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <lock.h>
 #include <device.h>
 #include <errorlog.h>
diff --git a/hw/fsp/fsp-op-panel.c b/hw/fsp/fsp-op-panel.c
index b494abddd6b4..139a1a766ca0 100644
--- a/hw/fsp/fsp-op-panel.c
+++ b/hw/fsp/fsp-op-panel.c
@@ -18,7 +18,6 @@
 #include <fsp.h>
 #include <lock.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <device.h>
 #include <processor.h>
 #include <opal-msg.h>
diff --git a/hw/fsp/fsp-sysparam.c b/hw/fsp/fsp-sysparam.c
index bd77a1f41771..a59c329eb10a 100644
--- a/hw/fsp/fsp-sysparam.c
+++ b/hw/fsp/fsp-sysparam.c
@@ -16,7 +16,6 @@
 #include <skiboot.h>
 #include <fsp.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <device.h>
 #include <lock.h>
 #include <processor.h>
diff --git a/hw/fsp/fsp.c b/hw/fsp/fsp.c
index c57052f64bc6..7a9d1ae56b84 100644
--- a/hw/fsp/fsp.c
+++ b/hw/fsp/fsp.c
@@ -36,7 +36,6 @@
 #include <cpu.h>
 #include <errorlog.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <opal-msg.h>
 #include <ccan/list/list.h>
 
diff --git a/hw/ipmi/ipmi-opal.c b/hw/ipmi/ipmi-opal.c
index 2bda3edd4bb2..237f8c094d84 100644
--- a/hw/ipmi/ipmi-opal.c
+++ b/hw/ipmi/ipmi-opal.c
@@ -19,7 +19,6 @@
 #include <ipmi.h>
 #include <lock.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <device.h>
 #include <ccan/list/list.h>
 
diff --git a/hw/ipmi/ipmi-rtc.c b/hw/ipmi/ipmi-rtc.c
index 46271e278cc3..01fb3e1ba0ab 100644
--- a/hw/ipmi/ipmi-rtc.c
+++ b/hw/ipmi/ipmi-rtc.c
@@ -21,7 +21,6 @@
 #include <time-utils.h>
 #include <device.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <rtc.h>
 
 static enum {idle, waiting, updated, error} time_status;
diff --git a/hw/lpc-uart.c b/hw/lpc-uart.c
index b73f69c663be..2e6114acd51c 100644
--- a/hw/lpc-uart.c
+++ b/hw/lpc-uart.c
@@ -18,7 +18,6 @@
 #include <lpc.h>
 #include <console.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <device.h>
 #include <interrupts.h>
 #include <processor.h>
diff --git a/hw/p7ioc-phb.c b/hw/p7ioc-phb.c
index 6689ff38bd24..d84fd1586a9b 100644
--- a/hw/p7ioc-phb.c
+++ b/hw/p7ioc-phb.c
@@ -24,7 +24,6 @@
 #include <pci-cfg.h>
 #include <interrupts.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <ccan/str/str.h>
 
 #define PHBDBG(p, fmt, a...)	prlog(PR_DEBUG, "PHB%d: " fmt, \
diff --git a/hw/p7ioc.c b/hw/p7ioc.c
index 77313d1af47b..2315e8163477 100644
--- a/hw/p7ioc.c
+++ b/hw/p7ioc.c
@@ -19,7 +19,6 @@
 #include <p7ioc-regs.h>
 #include <cec.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <io.h>
 #include <vpd.h>
 #include <interrupts.h>
diff --git a/hw/phb3.c b/hw/phb3.c
index 32da794e3beb..dfa49fa93042 100644
--- a/hw/phb3.c
+++ b/hw/phb3.c
@@ -35,7 +35,6 @@
 #include <vpd.h>
 #include <interrupts.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <cpu.h>
 #include <device.h>
 #include <ccan/str/str.h>
diff --git a/hw/prd.c b/hw/prd.c
index 1d9c61780159..e65ae57b61a8 100644
--- a/hw/prd.c
+++ b/hw/prd.c
@@ -19,7 +19,6 @@
 #include <lock.h>
 #include <xscom.h>
 #include <chip.h>
-#include <opal-api.h>
 #include <opal-msg.h>
 #include <fsp.h>
 
diff --git a/hw/psi.c b/hw/psi.c
index baba154cd203..c0692a1aca4f 100644
--- a/hw/psi.c
+++ b/hw/psi.c
@@ -21,7 +21,6 @@
 #include <psi.h>
 #include <fsp.h>
 #include <opal.h>
-#include <opal-api.h>
 #include <gx.h>
 #include <interrupts.h>
 #include <cpu.h>
-- 
2.1.0

More information about the Skiboot mailing list