diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-10-21 20:11:25 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-11-19 13:01:20 -0500 |
commit | a455589f181e60439c736c6c6a068bb7e6dc23f0 (patch) | |
tree | 48d377e7db8d21fd606ba8c84a72b95f3d23c10b /drivers/s390 | |
parent | 41d28bca2da4bd75a8915c1ccf2cacf7f4a2e531 (diff) |
assorted conversions to %p[dD]
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/s390')
-rw-r--r-- | drivers/s390/char/hmcdrv_dev.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/s390/char/hmcdrv_dev.c b/drivers/s390/char/hmcdrv_dev.c index 0c5176179c17..43cee7fcd01c 100644 --- a/drivers/s390/char/hmcdrv_dev.c +++ b/drivers/s390/char/hmcdrv_dev.c | |||
@@ -136,8 +136,7 @@ static int hmcdrv_dev_open(struct inode *inode, struct file *fp) | |||
136 | if (rc) | 136 | if (rc) |
137 | module_put(THIS_MODULE); | 137 | module_put(THIS_MODULE); |
138 | 138 | ||
139 | pr_debug("open file '/dev/%s' with return code %d\n", | 139 | pr_debug("open file '/dev/%pD' with return code %d\n", fp, rc); |
140 | fp->f_dentry->d_name.name, rc); | ||
141 | return rc; | 140 | return rc; |
142 | } | 141 | } |
143 | 142 | ||
@@ -146,7 +145,7 @@ static int hmcdrv_dev_open(struct inode *inode, struct file *fp) | |||
146 | */ | 145 | */ |
147 | static int hmcdrv_dev_release(struct inode *inode, struct file *fp) | 146 | static int hmcdrv_dev_release(struct inode *inode, struct file *fp) |
148 | { | 147 | { |
149 | pr_debug("closing file '/dev/%s'\n", fp->f_dentry->d_name.name); | 148 | pr_debug("closing file '/dev/%pD'\n", fp); |
150 | kfree(fp->private_data); | 149 | kfree(fp->private_data); |
151 | fp->private_data = NULL; | 150 | fp->private_data = NULL; |
152 | hmcdrv_ftp_shutdown(); | 151 | hmcdrv_ftp_shutdown(); |
@@ -231,8 +230,8 @@ static ssize_t hmcdrv_dev_read(struct file *fp, char __user *ubuf, | |||
231 | retlen = hmcdrv_dev_transfer((char *) fp->private_data, | 230 | retlen = hmcdrv_dev_transfer((char *) fp->private_data, |
232 | *pos, ubuf, len); | 231 | *pos, ubuf, len); |
233 | 232 | ||
234 | pr_debug("read from file '/dev/%s' at %lld returns %zd/%zu\n", | 233 | pr_debug("read from file '/dev/%pD' at %lld returns %zd/%zu\n", |
235 | fp->f_dentry->d_name.name, (long long) *pos, retlen, len); | 234 | fp, (long long) *pos, retlen, len); |
236 | 235 | ||
237 | if (retlen > 0) | 236 | if (retlen > 0) |
238 | *pos += retlen; | 237 | *pos += retlen; |
@@ -248,8 +247,8 @@ static ssize_t hmcdrv_dev_write(struct file *fp, const char __user *ubuf, | |||
248 | { | 247 | { |
249 | ssize_t retlen; | 248 | ssize_t retlen; |
250 | 249 | ||
251 | pr_debug("writing file '/dev/%s' at pos. %lld with length %zd\n", | 250 | pr_debug("writing file '/dev/%pD' at pos. %lld with length %zd\n", |
252 | fp->f_dentry->d_name.name, (long long) *pos, len); | 251 | fp, (long long) *pos, len); |
253 | 252 | ||
254 | if (!fp->private_data) { /* first expect a cmd write */ | 253 | if (!fp->private_data) { /* first expect a cmd write */ |
255 | fp->private_data = kmalloc(len + 1, GFP_KERNEL); | 254 | fp->private_data = kmalloc(len + 1, GFP_KERNEL); |
@@ -272,8 +271,7 @@ static ssize_t hmcdrv_dev_write(struct file *fp, const char __user *ubuf, | |||
272 | if (retlen > 0) | 271 | if (retlen > 0) |
273 | *pos += retlen; | 272 | *pos += retlen; |
274 | 273 | ||
275 | pr_debug("write to file '/dev/%s' returned %zd\n", | 274 | pr_debug("write to file '/dev/%pD' returned %zd\n", fp, retlen); |
276 | fp->f_dentry->d_name.name, retlen); | ||
277 | 275 | ||
278 | return retlen; | 276 | return retlen; |
279 | } | 277 | } |