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

Commit 730633d8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "USB: gadget: Remove configfs usage"

parents ce8cd952 3e6a2db8

drivers/usb/gadget/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ ccflags-y += -I$(srctree)/drivers/usb/gadget/udc -I$(srctree)/drivers/usb/gad 


obj-$(CONFIG_USB_LIBCOMPOSITE)	+= libcomposite.o

libcomposite-y			:= usbstring.o config.o epautoconf.o

libcomposite-y			+= composite.o functions.o configfs.o u_f.o

libcomposite-y			+= composite.o functions.o u_f.o



obj-y				+= debug.o

g_android-y			:= android.o

drivers/usb/gadget/function/f_fs.c

+0 −2
Original line number Diff line number Diff line
@@ -3576,8 +3576,6 @@ static void ffs_closed(struct ffs_data *ffs) 
	    || !atomic_read(&opts->func_inst.group.cg_item.ci_kref.refcount))

		goto done;



	unregister_gadget_item(ffs_obj->opts->

			       func_inst.group.cg_item.ci_parent->ci_parent);

done:

	ffs_dev_unlock();

}

drivers/usb/gadget/function/f_mass_storage.c

+0 −1
Original line number Diff line number Diff line
@@ -3645,7 +3645,6 @@ static void fsg_lun_drop(struct config_group *group, struct config_item *item) 
		struct config_item *gadget;



		gadget = group->cg_item.ci_parent->ci_parent;

		unregister_gadget_item(gadget);

	}



	fsg_common_remove_lun(lun_opts->lun, fsg_opts->common->sysfs);

drivers/usb/gadget/function/f_rndis.c

+0 −2
Original line number Diff line number Diff line
@@ -1150,8 +1150,6 @@ static struct usb_function_instance *rndis_alloc_inst(void) 


	descs[0] = &opts->rndis_os_desc;

	names[0] = "rndis";

	usb_os_desc_prepare_interf_dir(&opts->func_inst.group, 1, descs,

				       names, THIS_MODULE);

	config_group_init_type_name(&opts->func_inst.group, "",

				    &rndis_func_type);