mtd/drivers/mtd/devices pmc551.c,1.26,1.27

[David Woodhouse]

Update of /home/cvs/mtd/drivers/mtd/devices
In directory phoenix.infradead.org:/tmp/cvs-serv15736/drivers/mtd/devices

Modified Files:
	pmc551.c 
Log Message:
The patch below (applies against 2.6.8-rc2) removes some #ifdef's for 
kernel 2.0 and 2.2 from the MTD code.

diffstat output:
 drivers/mtd/chips/cfi_cmdset_0020.c |    5 -----
 drivers/mtd/nand/tx4925ndfmc.c      |    8 --------
 drivers/mtd/devices/pmc551.c        |   12 +++---------
 drivers/mtd/nand/autcpu12.c         |    8 --------
 include/linux/mtd/cfi.h             |    2 --
 5 files changed, 3 insertions(+), 32 deletions(-)


Signed-off-by: Adrian Bunk <bunk at fs.tum.de>


Index: pmc551.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/devices/pmc551.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- pmc551.c	14 Jul 2004 17:25:07 -0000	1.26
+++ pmc551.c	20 Jul 2004 02:44:26 -0000	1.27
@@ -109,12 +109,6 @@
 #include <linux/mtd/pmc551.h>
 #include <linux/mtd/compatmac.h>
 
-#if LINUX_VERSION_CODE > 0x20300
-#define PCI_BASE_ADDRESS(dev) (dev->resource[0].start)
-#else
-#define PCI_BASE_ADDRESS(dev) (dev->base_address[0])
-#endif
-
 static struct mtd_info *pmc551list;
 
 static int pmc551_erase (struct mtd_info *mtd, struct erase_info *instr)
@@ -564,7 +558,7 @@
 	       (size<1024)?size:(size<1048576)?size>>10:size>>20,
                (size<1024)?'B':(size<1048576)?'K':'M',
 	       size, ((dcmd&(0x1<<3)) == 0)?"non-":"",
-               PCI_BASE_ADDRESS(dev)&PCI_BASE_ADDRESS_MEM_MASK );
+               (dev->resource[0].start)&PCI_BASE_ADDRESS_MEM_MASK );
 
         /*
          * Check to see the state of the memory
@@ -694,7 +688,7 @@
                 }
 
                 printk(KERN_NOTICE "pmc551: Found PCI V370PDC at 0x%lX\n",
-				    PCI_BASE_ADDRESS(PCI_Device));
+				    PCI_Device->resource[0].start);
 
                 /*
                  * The PMC551 device acts VERY weird if you don't init it
@@ -748,7 +742,7 @@
 			printk(KERN_NOTICE "pmc551: Using specified aperture size %dM\n", asize>>20);
 			priv->asize = asize;
 		}
-                priv->start = ioremap((PCI_BASE_ADDRESS(PCI_Device)
+                priv->start = ioremap(((PCI_Device->resource[0].start)
                                        & PCI_BASE_ADDRESS_MEM_MASK),
                                       priv->asize);