Merge remote-tracking branch 'regulator/topic/fan53555' into regulator-next

[cascardo/linux.git] / fs / cifs / netmisc.c

diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c
index c0b25b2..af847e1 100644 (file)
--- a/fs/cifs/netmisc.c
+++ b/fs/cifs/netmisc.c
@@ -150,8 +150,8 @@ cifs_inet_pton(const int address_family, const char *cp, int len, void *dst)
        else if (address_family == AF_INET6)
                ret = in6_pton(cp, len, dst , '\\', NULL);
 
-       cFYI(DBG2, "address conversion returned %d for %*.*s",
-            ret, len, len, cp);
+       cifs_dbg(NOISY, "address conversion returned %d for %*.*s\n",
+                ret, len, len, cp);
        if (ret > 0)
                ret = 1;
        return ret;
@@ -887,7 +887,7 @@ map_smb_to_linux_error(char *buf, bool logErr)
        }
        /* else ERRHRD class errors or junk  - return EIO */
 
-       cFYI(1, "Mapping smb error code 0x%x to POSIX err %d",
+       cifs_dbg(FYI, "Mapping smb error code 0x%x to POSIX err %d\n",
                 le32_to_cpu(smb->Status.CifsError), rc);
 
        /* generic corrective action e.g. reconnect SMB session on
@@ -951,20 +951,20 @@ struct timespec cnvrtDosUnixTm(__le16 le_date, __le16 le_time, int offset)
        SMB_TIME *st = (SMB_TIME *)&time;
        SMB_DATE *sd = (SMB_DATE *)&date;
 
-       cFYI(1, "date %d time %d", date, time);
+       cifs_dbg(FYI, "date %d time %d\n", date, time);
 
        sec = 2 * st->TwoSeconds;
        min = st->Minutes;
        if ((sec > 59) || (min > 59))
-               cERROR(1, "illegal time min %d sec %d", min, sec);
+               cifs_dbg(VFS, "illegal time min %d sec %d\n", min, sec);
        sec += (min * 60);
        sec += 60 * 60 * st->Hours;
        if (st->Hours > 24)
-               cERROR(1, "illegal hours %d", st->Hours);
+               cifs_dbg(VFS, "illegal hours %d\n", st->Hours);
        days = sd->Day;
        month = sd->Month;
        if ((days > 31) || (month > 12)) {
-               cERROR(1, "illegal date, month %d day: %d", month, days);
+               cifs_dbg(VFS, "illegal date, month %d day: %d\n", month, days);
                if (month > 12)
                        month = 12;
        }
@@ -990,7 +990,7 @@ struct timespec cnvrtDosUnixTm(__le16 le_date, __le16 le_time, int offset)
 
        ts.tv_sec = sec + offset;
 
-       /* cFYI(1, "sec after cnvrt dos to unix time %d",sec); */
+       /* cifs_dbg(FYI, "sec after cnvrt dos to unix time %d\n",sec); */
 
        ts.tv_nsec = 0;
        return ts;