Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[cascardo/linux.git] / fs / udf / directory.c

diff --git a/fs/udf/directory.c b/fs/udf/directory.c
index 2ffdb67..3e44f57 100644 (file)
--- a/fs/udf/directory.c
+++ b/fs/udf/directory.c
@@ -162,8 +162,8 @@ struct fileIdentDesc *udf_get_fileident(void *buffer, int bufsize, int *offset)
        int padlen;
 
        if ((!buffer) || (!offset)) {
-               udf_debug("invalidparms\n, buffer=%p, offset=%p\n", buffer,
-                         offset);
+               udf_debug("invalidparms, buffer=%p, offset=%p\n",
+                         buffer, offset);
                return NULL;
        }
 
@@ -201,7 +201,7 @@ struct short_ad *udf_get_fileshortad(uint8_t *ptr, int maxoffset, uint32_t *offs
        struct short_ad *sa;
 
        if ((!ptr) || (!offset)) {
-               printk(KERN_ERR "udf: udf_get_fileshortad() invalidparms\n");
+               pr_err("%s: invalidparms\n", __func__);
                return NULL;
        }
 
@@ -223,7 +223,7 @@ struct long_ad *udf_get_filelongad(uint8_t *ptr, int maxoffset, uint32_t *offset
        struct long_ad *la;
 
        if ((!ptr) || (!offset)) {
-               printk(KERN_ERR "udf: udf_get_filelongad() invalidparms\n");
+               pr_err("%s: invalidparms\n", __func__);
                return NULL;
        }