Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6

Pull MTD changes from David Woodhouse:
 - Artem's cleanup of the MTD API continues apace.
 - Fixes and improvements for ST FSMC and SuperH FLCTL NAND, amongst
   others.
 - More work on DiskOnChip G3, new driver for DiskOnChip G4.
 - Clean up debug/warning printks in JFFS2 to use pr_<level>.

Fix up various trivial conflicts, largely due to changes in calling
conventions for things like dmaengine_prep_slave_sg() (new inline
wrapper to hide new parameter, clashing with rewrite of previously last
parameter that used to be an 'append' flag, and is now a bitmap of
'unsigned long flags').

(Also some header file fallout - like so many merges this merge window -
and silly conflicts with sparse fixes)

* tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6: (120 commits)
  mtd: docg3 add protection against concurrency
  mtd: docg3 refactor cascade floors structure
  mtd: docg3 increase write/erase timeout
  mtd: docg3 fix inbound calculations
  mtd: nand: gpmi: fix function annotations
  mtd: phram: fix section mismatch for phram_setup
  mtd: unify initialization of erase_info->fail_addr
  mtd: support ONFI multi lun NAND
  mtd: sm_ftl: fix typo in major number.
  mtd: add device-tree support to spear_smi
  mtd: spear_smi: Remove default partition information from driver
  mtd: Add device-tree support to fsmc_nand
  mtd: fix section mismatch for doc_probe_device
  mtd: nand/fsmc: Remove sparse warnings and errors
  mtd: nand/fsmc: Add DMA support
  mtd: nand/fsmc: Access the NAND device word by word whenever possible
  mtd: nand/fsmc: Use dev_err to report error scenario
  mtd: nand/fsmc: Use devm routines
  mtd: nand/fsmc: Modify fsmc driver to accept nand timing parameters via platform
  mtd: fsmc_nand: add pm callbacks to support hibernation
  ...

1 files changed, 16 insertions, 14 deletions

diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
index f2d96b5e64f6..f9916f312bd8 100644
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -9,6 +9,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
@@ -69,7 +71,7 @@ static void jffs2_write_super(struct super_block *sb)
         sb->s_dirt = 0;
 
         if (!(sb->s_flags & MS_RDONLY)) {
-                D1(printk(KERN_DEBUG "jffs2_write_super()\n"));
+                jffs2_dbg(1, "%s()\n", __func__);
                 jffs2_flush_wbuf_gc(c, 0);
         }
 
@@ -214,8 +216,8 @@ static int jffs2_parse_options(struct jffs2_sb_info *c, char *data)
                                                 JFFS2_COMPR_MODE_FORCEZLIB;
 #endif
                         else {
-                                printk(KERN_ERR "JFFS2 Error: unknown compressor \"%s\"",
-                                                name);
+                                pr_err("Error: unknown compressor \"%s\"\n",
+                                       name);
                                 kfree(name);
                                 return -EINVAL;
                         }
@@ -223,8 +225,8 @@ static int jffs2_parse_options(struct jffs2_sb_info *c, char *data)
                         c->mount_opts.override_compr = true;
                         break;
                 default:
-                        printk(KERN_ERR "JFFS2 Error: unrecognized mount option '%s' or missing value\n",
-                                        p);
+                        pr_err("Error: unrecognized mount option '%s' or missing value\n",
+                               p);
                         return -EINVAL;
                 }
         }
@@ -266,9 +268,9 @@ static int jffs2_fill_super(struct super_block *sb, void *data, int silent)
         struct jffs2_sb_info *c;
         int ret;
 
-        D1(printk(KERN_DEBUG "jffs2_get_sb_mtd():"
+        jffs2_dbg(1, "jffs2_get_sb_mtd():"
                   " New superblock for device %d (\"%s\")\n",
-                  sb->s_mtd->index, sb->s_mtd->name));
+                  sb->s_mtd->index, sb->s_mtd->name);
 
         c = kzalloc(sizeof(*c), GFP_KERNEL);
         if (!c)
@@ -315,7 +317,7 @@ static void jffs2_put_super (struct super_block *sb)
 {
         struct jffs2_sb_info *c = JFFS2_SB_INFO(sb);
 
-        D2(printk(KERN_DEBUG "jffs2: jffs2_put_super()\n"));
+        jffs2_dbg(2, "%s()\n", __func__);
 
         if (sb->s_dirt)
                 jffs2_write_super(sb);
@@ -336,7 +338,7 @@ static void jffs2_put_super (struct super_block *sb)
         kfree(c->inocache_list);
         jffs2_clear_xattr_subsystem(c);
         mtd_sync(c->mtd);
-        D1(printk(KERN_DEBUG "jffs2_put_super returning\n"));
+        jffs2_dbg(1, "%s(): returning\n", __func__);
 }
 
 static void jffs2_kill_sb(struct super_block *sb)
@@ -371,7 +373,7 @@ static int __init init_jffs2_fs(void)
         BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68);
         BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32);
 
-        printk(KERN_INFO "JFFS2 version 2.2."
+        pr_info("version 2.2."
 #ifdef CONFIG_JFFS2_FS_WRITEBUFFER
                " (NAND)"
 #endif
@@ -386,22 +388,22 @@ static int __init init_jffs2_fs(void)
                                                 SLAB_MEM_SPREAD),
                                              jffs2_i_init_once);
         if (!jffs2_inode_cachep) {
-                printk(KERN_ERR "JFFS2 error: Failed to initialise inode cache\n");
+                pr_err("error: Failed to initialise inode cache\n");
                 return -ENOMEM;
         }
         ret = jffs2_compressors_init();
         if (ret) {
-                printk(KERN_ERR "JFFS2 error: Failed to initialise compressors\n");
+                pr_err("error: Failed to initialise compressors\n");
                 goto out;
         }
         ret = jffs2_create_slab_caches();
         if (ret) {
-                printk(KERN_ERR "JFFS2 error: Failed to initialise slab caches\n");
+                pr_err("error: Failed to initialise slab caches\n");
                 goto out_compressors;
         }
         ret = register_filesystem(&jffs2_fs_type);
         if (ret) {
-                printk(KERN_ERR "JFFS2 error: Failed to register filesystem\n");
+                pr_err("error: Failed to register filesystem\n");
                 goto out_slab;
         }
         return 0;