Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / drivers / mtd / spi-nor / intel-spi.c

diff --git a/drivers/mtd/spi-nor/intel-spi.c b/drivers/mtd/spi-nor/intel-spi.c
index ef034d898a2363ea6e90672eca7264e8c8e4fa88..6999515231791c1010d83aa11692f19c5ca22e70 100644 (file)
--- a/drivers/mtd/spi-nor/intel-spi.c
+++ b/drivers/mtd/spi-nor/intel-spi.c
@@ -138,7 +138,6 @@
  * @erase_64k: 64k erase supported
  * @opcodes: Opcodes which are supported. This are programmed by BIOS
  *           before it locks down the controller.
- * @preopcodes: Preopcodes which are supported.
  */
 struct intel_spi {
        struct device *dev;
@@ -155,7 +154,6 @@ struct intel_spi {
        bool swseq_erase;
        bool erase_64k;
        u8 opcodes[8];
-       u8 preopcodes[2];
 };
 
 static bool writeable;
@@ -400,10 +398,6 @@ static int intel_spi_init(struct intel_spi *ispi)
                                ispi->opcodes[i] = opmenu0 >> i * 8;
                                ispi->opcodes[i + 4] = opmenu1 >> i * 8;
                        }
-
-                       val = readl(ispi->sregs + PREOP_OPTYPE);
-                       ispi->preopcodes[0] = val;
-                       ispi->preopcodes[1] = val >> 8;
                }
        }