As struct ffs_desc_helper have one struct ffs_data *ffs member, but it
related function already have struct ffs_data *ffs parameter, it is safe
to remove the struct member.
Signed-off-by: Linyu Yuan <quic_linyyuan@xxxxxxxxxxx>
---
v3: new patch in this version
drivers/usb/gadget/function/f_fs.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index 32e66f01..a4051c8 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -231,7 +231,6 @@ struct ffs_io_data {
};
struct ffs_desc_helper {
- struct ffs_data *ffs;
unsigned interfaces_count;
unsigned eps_count;
};
@@ -2196,8 +2195,8 @@ static int __ffs_data_do_entity(struct ffs_data *ffs, enum ffs_entity_type type,
* Strings are indexed from 1 (0 is reserved
* for languages list)
*/
- if (*valuep > helper->ffs->strings_count)
- helper->ffs->strings_count = *valuep;
+ if (*valuep > ffs->strings_count)
+ ffs->strings_count = *valuep;
break;
case FFS_ENDPOINT:
@@ -2206,10 +2205,10 @@ static int __ffs_data_do_entity(struct ffs_data *ffs, enum ffs_entity_type type,
if (helper->eps_count >= FFS_MAX_EPS_COUNT)
return -EINVAL;
/* Check if descriptors for any speed were already parsed */
- if (!helper->ffs->eps_count && !helper->ffs->interfaces_count)
- helper->ffs->eps_addrmap[helper->eps_count] =
+ if (!ffs->eps_count && !ffs->interfaces_count)
+ ffs->eps_addrmap[helper->eps_count] =
d->bEndpointAddress;
- else if (helper->ffs->eps_addrmap[helper->eps_count] !=
+ else if (ffs->eps_addrmap[helper->eps_count] !=
d->bEndpointAddress)
return -EINVAL;
break;
@@ -2485,7 +2484,6 @@ static int __ffs_data_got_descs(struct ffs_data *ffs,
/* Read descriptors */
raw_descs = data;
- helper.ffs = ffs;
for (i = 0; i < 3; ++i) {
if (!counts[i])
continue;
--
2.7.4
