[flashrom] [PATCH] remove unneeded inclusions of chipdrivers.h

Stefan Tauner stefan.tauner at student.tuwien.ac.at
Sun Jul 10 14:01:44 CEST 2011


this is related to the spi split patch as discussed in:
http://www.flashrom.org/pipermail/flashrom/2010-February/thread.html#2364
the old commit (r914) log notes:
"Some of the spi programmer drivers required chipdrivers.h, needs fixing later:   it87spi.c   ichspi.c   sb600spi.c   wbsio_spi.c   buspirate_spi.c   ft2232spi.c   bitbang_spi.c   dediprog.c"

there still remain a few cases where chipdrivers.h is needed:
dediprog.c
it87spi.c
wbsio_spi.c (spi_programmer registration only)

besides that, there are also non-spi files that do not need it.

Signed-off-by: Stefan Tauner <stefan.tauner at student.tuwien.ac.at>
---
 bitbang_spi.c   |    1 -
 buspirate_spi.c |    1 -
 ft2232_spi.c    |    1 -
 ichspi.c        |    1 -
 it85spi.c       |    1 -
 jedec.c         |    1 -
 pm49fl00x.c     |    1 -
 sb600spi.c      |    1 -
 sst_fwhub.c     |    1 -
 w29ee011.c      |    1 -
 w39.c           |    1 -
 11 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/bitbang_spi.c b/bitbang_spi.c
index 3c718af..8e2f780 100644
--- a/bitbang_spi.c
+++ b/bitbang_spi.c
@@ -22,7 +22,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include "flash.h"
-#include "chipdrivers.h"
 #include "programmer.h"
 #include "spi.h"
 
diff --git a/buspirate_spi.c b/buspirate_spi.c
index f872309..caa27c0 100644
--- a/buspirate_spi.c
+++ b/buspirate_spi.c
@@ -23,7 +23,6 @@
 #include <ctype.h>
 #include <unistd.h>
 #include "flash.h"
-#include "chipdrivers.h"
 #include "programmer.h"
 #include "spi.h"
 
diff --git a/ft2232_spi.c b/ft2232_spi.c
index 7416e5b..cf67ff5 100644
--- a/ft2232_spi.c
+++ b/ft2232_spi.c
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include "flash.h"
-#include "chipdrivers.h"
 #include "programmer.h"
 #include "spi.h"
 #include <ftdi.h>
diff --git a/ichspi.c b/ichspi.c
index 99c4613..d9c9b4b 100644
--- a/ichspi.c
+++ b/ichspi.c
@@ -38,7 +38,6 @@
 
 #include <string.h>
 #include "flash.h"
-#include "chipdrivers.h"
 #include "programmer.h"
 #include "spi.h"
 
diff --git a/it85spi.c b/it85spi.c
index d4ca13b..c82f975 100644
--- a/it85spi.c
+++ b/it85spi.c
@@ -30,7 +30,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "flash.h"
-#include "chipdrivers.h"
 #include "spi.h"
 #include "programmer.h"
 
diff --git a/jedec.c b/jedec.c
index b96f5fd..cf34bcd 100644
--- a/jedec.c
+++ b/jedec.c
@@ -23,7 +23,6 @@
  */
 
 #include "flash.h"
-#include "chipdrivers.h"
 
 #define MAX_REFLASH_TRIES 0x10
 #define MASK_FULL 0xffff
diff --git a/pm49fl00x.c b/pm49fl00x.c
index 4136b17..28052e5 100644
--- a/pm49fl00x.c
+++ b/pm49fl00x.c
@@ -21,7 +21,6 @@
  */
 
 #include "flash.h"
-#include "chipdrivers.h"
 
 static void write_lockbits_49fl00x(chipaddr bios, int size,
 			    unsigned char bits, int block_size)
diff --git a/sb600spi.c b/sb600spi.c
index 37aac3b..5ad5782 100644
--- a/sb600spi.c
+++ b/sb600spi.c
@@ -24,7 +24,6 @@
 #if defined(__i386__) || defined(__x86_64__)
 
 #include "flash.h"
-#include "chipdrivers.h"
 #include "programmer.h"
 #include "spi.h"
 
diff --git a/sst_fwhub.c b/sst_fwhub.c
index 65bd2b3..a11cccb 100644
--- a/sst_fwhub.c
+++ b/sst_fwhub.c
@@ -23,7 +23,6 @@
 /* Adapted from the Intel FW hub stuff for 82802ax parts. */
 
 #include "flash.h"
-#include "chipdrivers.h"
 
 static int check_sst_fwhub_block_lock(struct flashchip *flash, int offset)
 {
diff --git a/w29ee011.c b/w29ee011.c
index 4fc8853..de6b63c 100644
--- a/w29ee011.c
+++ b/w29ee011.c
@@ -20,7 +20,6 @@
 
 #include <string.h>
 #include "flash.h"
-#include "chipdrivers.h"
 
 int probe_w29ee011(struct flashchip *flash)
 {
diff --git a/w39.c b/w39.c
index 2635988..5e5d59e 100644
--- a/w39.c
+++ b/w39.c
@@ -20,7 +20,6 @@
  */
 
 #include "flash.h"
-#include "chipdrivers.h"
 
 static int printlock_w39_fwh_block(struct flashchip *flash, int offset)
 {
-- 
1.7.1





More information about the flashrom mailing list