Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd7c9a00 authored by Michal Nazarewicz's avatar Michal Nazarewicz Committed by Greg Kroah-Hartman
Browse files

USB: gadget: f_fs: use usb_string_ids_n() 



Use usb_string_ids_n() function to simplify string ids
registeration.

Signed-off-by: default avatarMichal Nazarewicz <m.nazarewicz@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f2adc4f8

drivers/usb/gadget/f_fs.c

+12 −18
Original line number Original line Diff line number Diff line
@@ -1375,7 +1375,8 @@ static void ffs_data_reset(struct ffs_data *ffs) 




static int functionfs_bind(struct ffs_data *ffs, struct usb_composite_dev *cdev)

static int functionfs_bind(struct ffs_data *ffs, struct usb_composite_dev *cdev)

{

{

	unsigned i, count;

	struct usb_gadget_strings **lang;

	int first_id;





	ENTER();

	ENTER();
@@ -1383,7 +1384,9 @@ static int functionfs_bind(struct ffs_data *ffs, struct usb_composite_dev *cdev) 
		 || test_and_set_bit(FFS_FL_BOUND, &ffs->flags)))

		 || test_and_set_bit(FFS_FL_BOUND, &ffs->flags)))

		return -EBADFD;

		return -EBADFD;





	ffs_data_get(ffs);

	first_id = usb_string_ids_n(cdev, ffs->strings_count);

	if (unlikely(first_id < 0))

		return first_id;





	ffs->ep0req = usb_ep_alloc_request(cdev->gadget->ep0, GFP_KERNEL);

	ffs->ep0req = usb_ep_alloc_request(cdev->gadget->ep0, GFP_KERNEL);

	if (unlikely(!ffs->ep0req))

	if (unlikely(!ffs->ep0req))
@@ -1391,25 +1394,16 @@ static int functionfs_bind(struct ffs_data *ffs, struct usb_composite_dev *cdev) 
	ffs->ep0req->complete = ffs_ep0_complete;

	ffs->ep0req->complete = ffs_ep0_complete;

	ffs->ep0req->context = ffs;

	ffs->ep0req->context = ffs;





	/* Get strings identifiers */

	for (count = ffs->strings_count, i = 0; i < count; ++i) {

		struct usb_gadget_strings **lang;



		int id = usb_string_id(cdev);

		if (unlikely(id < 0)) {

			usb_ep_free_request(cdev->gadget->ep0, ffs->ep0req);

			ffs->ep0req = NULL;

			return id;

		}



	lang = ffs->stringtabs;

	lang = ffs->stringtabs;

		do {

	for (lang = ffs->stringtabs; *lang; ++lang) {

			(*lang)->strings[i].id = id;

		struct usb_string *str = (*lang)->strings;

			++lang;

		int id = first_id;

		} while (*lang);

		for (; str->s; ++id, ++str)

			str->id = id;

	}

	}





	ffs->gadget = cdev->gadget;

	ffs->gadget = cdev->gadget;

	ffs_data_get(ffs);

	return 0;

	return 0;

}

}