diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-06-06 17:36:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-06 19:08:09 -0400 |
commit | 6d6bd94f4d83d70cdff67d0bf2a64ef6878216e7 (patch) | |
tree | 305ab4f98bcdc25669129ded4f530dd12f5f6407 /fs/coda/psdev.c | |
parent | f38cfb2564f5fead53eebd9617258ee0376b1906 (diff) |
fs/coda: use __func__
Replace all function names by __func__ in pr_foo()
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Jan Harkes <jaharkes@cs.cmu.edu>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/coda/psdev.c')
-rw-r--r-- | fs/coda/psdev.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c index 39ebb148d0d8..5c1e4242368b 100644 --- a/fs/coda/psdev.c +++ b/fs/coda/psdev.c | |||
@@ -136,8 +136,8 @@ static ssize_t coda_psdev_write(struct file *file, const char __user *buf, | |||
136 | 136 | ||
137 | CODA_FREE(dcbuf, nbytes); | 137 | CODA_FREE(dcbuf, nbytes); |
138 | if (error) { | 138 | if (error) { |
139 | pr_warn("psdev_write: coda_downcall error: %d\n", | 139 | pr_warn("%s: coda_downcall error: %d\n", |
140 | error); | 140 | __func__, error); |
141 | retval = error; | 141 | retval = error; |
142 | goto out; | 142 | goto out; |
143 | } | 143 | } |
@@ -158,16 +158,17 @@ static ssize_t coda_psdev_write(struct file *file, const char __user *buf, | |||
158 | mutex_unlock(&vcp->vc_mutex); | 158 | mutex_unlock(&vcp->vc_mutex); |
159 | 159 | ||
160 | if (!req) { | 160 | if (!req) { |
161 | pr_warn("psdev_write: msg (%d, %d) not found\n", | 161 | pr_warn("%s: msg (%d, %d) not found\n", |
162 | hdr.opcode, hdr.unique); | 162 | __func__, hdr.opcode, hdr.unique); |
163 | retval = -ESRCH; | 163 | retval = -ESRCH; |
164 | goto out; | 164 | goto out; |
165 | } | 165 | } |
166 | 166 | ||
167 | /* move data into response buffer. */ | 167 | /* move data into response buffer. */ |
168 | if (req->uc_outSize < nbytes) { | 168 | if (req->uc_outSize < nbytes) { |
169 | pr_warn("psdev_write: too much cnt: %d, cnt: %ld, opc: %d, uniq: %d.\n", | 169 | pr_warn("%s: too much cnt: %d, cnt: %ld, opc: %d, uniq: %d.\n", |
170 | req->uc_outSize, (long)nbytes, hdr.opcode, hdr.unique); | 170 | __func__, req->uc_outSize, (long)nbytes, |
171 | hdr.opcode, hdr.unique); | ||
171 | nbytes = req->uc_outSize; /* don't have more space! */ | 172 | nbytes = req->uc_outSize; /* don't have more space! */ |
172 | } | 173 | } |
173 | if (copy_from_user(req->uc_data, buf, nbytes)) { | 174 | if (copy_from_user(req->uc_data, buf, nbytes)) { |
@@ -241,8 +242,8 @@ static ssize_t coda_psdev_read(struct file * file, char __user * buf, | |||
241 | /* Move the input args into userspace */ | 242 | /* Move the input args into userspace */ |
242 | count = req->uc_inSize; | 243 | count = req->uc_inSize; |
243 | if (nbytes < req->uc_inSize) { | 244 | if (nbytes < req->uc_inSize) { |
244 | pr_warn("psdev_read: Venus read %ld bytes of %d in message\n", | 245 | pr_warn("%s: Venus read %ld bytes of %d in message\n", |
245 | (long)nbytes, req->uc_inSize); | 246 | __func__, (long)nbytes, req->uc_inSize); |
246 | count = nbytes; | 247 | count = nbytes; |
247 | } | 248 | } |
248 | 249 | ||
@@ -306,7 +307,7 @@ static int coda_psdev_release(struct inode * inode, struct file * file) | |||
306 | struct upc_req *req, *tmp; | 307 | struct upc_req *req, *tmp; |
307 | 308 | ||
308 | if (!vcp || !vcp->vc_inuse ) { | 309 | if (!vcp || !vcp->vc_inuse ) { |
309 | pr_warn("psdev_release: Not open.\n"); | 310 | pr_warn("%s: Not open.\n", __func__); |
310 | return -1; | 311 | return -1; |
311 | } | 312 | } |
312 | 313 | ||
@@ -355,8 +356,8 @@ static int init_coda_psdev(void) | |||
355 | { | 356 | { |
356 | int i, err = 0; | 357 | int i, err = 0; |
357 | if (register_chrdev(CODA_PSDEV_MAJOR, "coda", &coda_psdev_fops)) { | 358 | if (register_chrdev(CODA_PSDEV_MAJOR, "coda", &coda_psdev_fops)) { |
358 | pr_err("coda_psdev: unable to get major %d\n", | 359 | pr_err("%s: unable to get major %d\n", |
359 | CODA_PSDEV_MAJOR); | 360 | __func__, CODA_PSDEV_MAJOR); |
360 | return -EIO; | 361 | return -EIO; |
361 | } | 362 | } |
362 | coda_psdev_class = class_create(THIS_MODULE, "coda"); | 363 | coda_psdev_class = class_create(THIS_MODULE, "coda"); |