projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[cascardo/linux.git]
/
drivers
/
usb
/
gadget
/
function
/
f_fs.c
diff --git
a/drivers/usb/gadget/function/f_fs.c
b/drivers/usb/gadget/function/f_fs.c
index
4ad11e0
..
7c6771d
100644
(file)
--- a/
drivers/usb/gadget/function/f_fs.c
+++ b/
drivers/usb/gadget/function/f_fs.c
@@
-164,10
+164,9
@@
struct ffs_desc_helper {
static int __must_check ffs_epfiles_create(struct ffs_data *ffs);
static void ffs_epfiles_destroy(struct ffs_epfile *epfiles, unsigned count);
static int __must_check ffs_epfiles_create(struct ffs_data *ffs);
static void ffs_epfiles_destroy(struct ffs_epfile *epfiles, unsigned count);
-static struct
inode *__must_check
+static struct
dentry *
ffs_sb_create_file(struct super_block *sb, const char *name, void *data,
ffs_sb_create_file(struct super_block *sb, const char *name, void *data,
- const struct file_operations *fops,
- struct dentry **dentry_p);
+ const struct file_operations *fops);
/* Devices management *******************************************************/
/* Devices management *******************************************************/
@@
-1119,10
+1118,9
@@
ffs_sb_make_inode(struct super_block *sb, void *data,
}
/* Create "regular" file */
}
/* Create "regular" file */
-static struct
inode
*ffs_sb_create_file(struct super_block *sb,
+static struct
dentry
*ffs_sb_create_file(struct super_block *sb,
const char *name, void *data,
const char *name, void *data,
- const struct file_operations *fops,
- struct dentry **dentry_p)
+ const struct file_operations *fops)
{
struct ffs_data *ffs = sb->s_fs_info;
struct dentry *dentry;
{
struct ffs_data *ffs = sb->s_fs_info;
struct dentry *dentry;
@@
-1141,10
+1139,7
@@
static struct inode *ffs_sb_create_file(struct super_block *sb,
}
d_add(dentry, inode);
}
d_add(dentry, inode);
- if (dentry_p)
- *dentry_p = dentry;
-
- return inode;
+ return dentry;
}
/* Super block */
}
/* Super block */
@@
-1189,7
+1184,7
@@
static int ffs_sb_fill(struct super_block *sb, void *_data, int silent)
/* EP0 file */
if (unlikely(!ffs_sb_create_file(sb, "ep0", ffs,
/* EP0 file */
if (unlikely(!ffs_sb_create_file(sb, "ep0", ffs,
- &ffs_ep0_operations
, NULL
)))
+ &ffs_ep0_operations)))
return -ENOMEM;
return 0;
return -ENOMEM;
return 0;
@@
-1561,9
+1556,10
@@
static int ffs_epfiles_create(struct ffs_data *ffs)
sprintf(epfiles->name, "ep%02x", ffs->eps_addrmap[i]);
else
sprintf(epfiles->name, "ep%u", i);
sprintf(epfiles->name, "ep%02x", ffs->eps_addrmap[i]);
else
sprintf(epfiles->name, "ep%u", i);
- if (!unlikely(ffs_sb_create_file(ffs->sb, epfiles->name, epfile,
- &ffs_epfile_operations,
- &epfile->dentry))) {
+ epfile->dentry = ffs_sb_create_file(ffs->sb, epfiles->name,
+ epfile,
+ &ffs_epfile_operations);
+ if (unlikely(!epfile->dentry)) {
ffs_epfiles_destroy(epfiles, i - 1);
return -ENOMEM;
}
ffs_epfiles_destroy(epfiles, i - 1);
return -ENOMEM;
}