Merge tag 'for-linus-20131112' of git://git.infradead.org/linux-mtd

Pull MTD changes from Brian Norris:
 - Unify some compile-time differences so that we have fewer uses of
   #ifdef CONFIG_OF in atmel_nand
 - Other general cleanups (removing unused functions, options,
   variables, fields; use correct interfaces)
 - Fix BUG() for new odd-sized NAND, which report non-power-of-2
   dimensions via ONFI
 - Miscellaneous driver fixes (SPI NOR flash; BCM47xx NAND flash; etc.)
 - Improve differentiation between SLC and MLC NAND -- this clarifies an
   ABI issue regarding the MTD "type" (in sysfs and in the MEMGETINFO
   ioctl), where the MTD_MLCNANDFLASH type was present but
   inconsistently used
 - Extend GPMI NAND to support multi-chip-select NAND for some platforms
 - Many improvements to the OMAP2/3 NAND driver, including an expanded
   DT binding to bring us closer to mainline support for some OMAP
   systems
 - Fix a deadlock in the error path of the Atmel NAND driver probe
 - Correct the error codes from MTD mmap() to conform to POSIX and the
   Linux Programmer's Manual.  This is an acknowledged change in the MTD
   ABI, but I can't imagine somebody relying on the non-standard -ENOSYS
   error code specifically.  Am I just being unimaginative? :)
 - Fix a few important GPMI NAND bugs (one regression from 3.12 and one
   long-standing race condition)
 - More? Read the log!

* tag 'for-linus-20131112' of git://git.infradead.org/linux-mtd: (98 commits)
  mtd: gpmi: fix the NULL pointer
  mtd: gpmi: fix kernel BUG due to racing DMA operations
  mtd: mtdchar: return expected errors on mmap() call
  mtd: gpmi: only scan two chips for imx6
  mtd: gpmi: Use devm_kzalloc()
  mtd: atmel_nand: fix bug driver will in a dead lock if no nand detected
  mtd: nand: use a local variable to simplify the nand_scan_tail
  mtd: nand: remove deprecated IRQF_DISABLED
  mtd: dataflash: Say if we find a device we don't support
  mtd: nand: omap: fix error return code in omap_nand_probe()
  mtd: nand_bbt: kill NAND_BBT_SCANALLPAGES
  mtd: m25p80: fixup device removal failure path
  mtd: mxc_nand: Include linux/of.h header
  mtd: remove duplicated include from mtdcore.c
  mtd: m25p80: add support for Macronix mx25l3255e
  mtd: nand: omap: remove selection of BCH ecc-scheme via KConfig
  mtd: nand: omap: updated devm_xx for all resource allocation and free calls
  mtd: nand: omap: use drivers/mtd/nand/nand_bch.c wrapper for BCH ECC instead of lib/bch.c
  mtd: nand: omap: clean-up ecc layout for BCH ecc schemes
  mtd: nand: omap2: clean-up BCHx_HW and BCHx_SW ECC configurations in device_probe
  ...

1 files changed, 33 insertions, 33 deletions

diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
index 67823de68db6..e1f2aebaa489 100644
--- a/drivers/mtd/devices/phram.c
+++ b/drivers/mtd/devices/phram.c
@@ -94,7 +94,7 @@ static void unregister_devices(void)
         }
 }
 
-static int register_device(char *name, unsigned long start, unsigned long len)
+static int register_device(char *name, phys_addr_t start, size_t len)
 {
         struct phram_mtd_list *new;
         int ret = -ENOMEM;
@@ -141,35 +141,35 @@ out0:
         return ret;
 }
 
-static int ustrtoul(const char *cp, char **endp, unsigned int base)
+static int parse_num64(uint64_t *num64, char *token)
 {
-        unsigned long result = simple_strtoul(cp, endp, base);
-
-        switch (**endp) {
-        case 'G':
-                result *= 1024;
-        case 'M':
-                result *= 1024;
-        case 'k':
-                result *= 1024;
+        size_t len;
+        int shift = 0;
+        int ret;
+
+        len = strlen(token);
         /* By dwmw2 editorial decree, "ki", "Mi" or "Gi" are to be used. */
-                if ((*endp)[1] == 'i')
-                        (*endp) += 2;
+        if (len > 2) {
+                if (token[len - 1] == 'i') {
+                        switch (token[len - 2]) {
+                        case 'G':
+                                shift += 10;
+                        case 'M':
+                                shift += 10;
+                        case 'k':
+                                shift += 10;
+                                token[len - 2] = 0;
+                                break;
+                        default:
+                                return -EINVAL;
+                        }
+                }
         }
-        return result;
-}
 
-static int parse_num32(uint32_t *num32, const char *token)
-{
-        char *endp;
-        unsigned long n;
+        ret = kstrtou64(token, 0, num64);
+        *num64 <<= shift;
 
-        n = ustrtoul(token, &endp, 0);
-        if (*endp)
-                return -EINVAL;
-
-        *num32 = n;
-        return 0;
+        return ret;
 }
 
 static int parse_name(char **pname, const char *token)
@@ -209,19 +209,19 @@ static inline void kill_final_newline(char *str)
  * This shall contain the module parameter if any. It is of the form:
  * - phram=<device>,<address>,<size> for module case
  * - phram.phram=<device>,<address>,<size> for built-in case
- * We leave 64 bytes for the device name, 12 for the address and 12 for the
+ * We leave 64 bytes for the device name, 20 for the address and 20 for the
  * size.
  * Example: phram.phram=rootfs,0xa0000000,512Mi
  */
-static __initdata char phram_paramline[64+12+12];
+static __initdata char phram_paramline[64 + 20 + 20];
 
 static int __init phram_setup(const char *val)
 {
-        char buf[64+12+12], *str = buf;
+        char buf[64 + 20 + 20], *str = buf;
         char *token[3];
         char *name;
-        uint32_t start;
-        uint32_t len;
+        uint64_t start;
+        uint64_t len;
         int i, ret;
 
         if (strnlen(val, sizeof(buf)) >= sizeof(buf))
@@ -243,13 +243,13 @@ static int __init phram_setup(const char *val)
         if (ret)
                 return ret;
 
-        ret = parse_num32(&start, token[1]);
+        ret = parse_num64(&start, token[1]);
         if (ret) {
                 kfree(name);
                 parse_err("illegal start address\n");
         }
 
-        ret = parse_num32(&len, token[2]);
+        ret = parse_num64(&len, token[2]);
         if (ret) {
                 kfree(name);
                 parse_err("illegal device length\n");
@@ -257,7 +257,7 @@ static int __init phram_setup(const char *val)
 
         ret = register_device(name, start, len);
         if (!ret)
-                pr_info("%s device: %#x at %#x\n", name, len, start);
+                pr_info("%s device: %#llx at %#llx\n", name, len, start);
         else
                 kfree(name);