diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-17 18:18:19 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-17 18:18:19 -0500 |
commit | c6b1de1b646fe232206d4065df4d14040cebd613 (patch) | |
tree | 271b208be1e0e6e026da5979311197fe5a791a11 /drivers/usb | |
parent | 50652963eae6afe13678dc84d789a174306a4df7 (diff) | |
parent | e59b4e9187bd5175b9845dc10fedb0879b7efbfd (diff) |
Merge branch 'debugfs_automount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull debugfs patches from Al Viro:
"debugfs patches, mostly to make it possible for something like tracefs
to be transparently automounted on given directory in debugfs.
New primitive in there is debugfs_create_automount(name, parent, func,
arg), which creates a directory and makes its ->d_automount() return
func(arg). Another missing primitive was debugfs_create_file_size() -
open-coded in quite a few places. Dave's patch adds it and converts
the open-code instances to calling it"
* 'debugfs_automount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
debugfs: Provide a file creation function that also takes an initial size
new primitive: debugfs_create_automount()
debugfs: split end_creating() into success and failure cases
debugfs: take mode-dependent parts of debugfs_get_inode() into callers
fold debugfs_mknod() into callers
fold debugfs_create() into caller
fold debugfs_mkdir() into caller
debugfs_mknod(): get rid useless arguments
fold debugfs_link() into caller
debugfs: kill __create_file()
debugfs: split the beginning and the end of __create_file() off
debugfs_{mkdir,create,link}(): get rid of redundant argument
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/gadget/udc/atmel_usba_udc.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c index c0410862c2a1..d79cb35dbf8a 100644 --- a/drivers/usb/gadget/udc/atmel_usba_udc.c +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c | |||
@@ -265,14 +265,17 @@ static void usba_init_debugfs(struct usba_udc *udc) | |||
265 | goto err_root; | 265 | goto err_root; |
266 | udc->debugfs_root = root; | 266 | udc->debugfs_root = root; |
267 | 267 | ||
268 | regs = debugfs_create_file("regs", 0400, root, udc, ®s_dbg_fops); | ||
269 | if (!regs) | ||
270 | goto err_regs; | ||
271 | |||
272 | regs_resource = platform_get_resource(udc->pdev, IORESOURCE_MEM, | 268 | regs_resource = platform_get_resource(udc->pdev, IORESOURCE_MEM, |
273 | CTRL_IOMEM_ID); | 269 | CTRL_IOMEM_ID); |
274 | regs->d_inode->i_size = resource_size(regs_resource); | 270 | |
275 | udc->debugfs_regs = regs; | 271 | if (regs_resource) { |
272 | regs = debugfs_create_file_size("regs", 0400, root, udc, | ||
273 | ®s_dbg_fops, | ||
274 | resource_size(regs_resource)); | ||
275 | if (!regs) | ||
276 | goto err_regs; | ||
277 | udc->debugfs_regs = regs; | ||
278 | } | ||
276 | 279 | ||
277 | usba_ep_init_debugfs(udc, to_usba_ep(udc->gadget.ep0)); | 280 | usba_ep_init_debugfs(udc, to_usba_ep(udc->gadget.ep0)); |
278 | 281 | ||