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

Commit be6eb693 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mhi: core: use debugfs lookup method to find parent directory"

parents b8170fe2 16fb3e80

drivers/bus/mhi/core/mhi_init.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -1158,7 +1158,7 @@ int of_register_mhi_controller(struct mhi_controller *mhi_cntrl) 




	mhi_cntrl->mhi_dev = mhi_dev;

	mhi_cntrl->mhi_dev = mhi_dev;





	mhi_cntrl->parent = mhi_bus.dentry;

	mhi_cntrl->parent = debugfs_lookup(mhi_bus_type.name, NULL);

	mhi_cntrl->klog_lvl = MHI_MSG_LVL_ERROR;

	mhi_cntrl->klog_lvl = MHI_MSG_LVL_ERROR;





	/* adding it to this list only for debug purpose */

	/* adding it to this list only for debug purpose */
@@ -1493,14 +1493,13 @@ struct mhi_device *mhi_alloc_device(struct mhi_controller *mhi_cntrl) 




static int __init mhi_init(void)

static int __init mhi_init(void)

{

{

	struct dentry *dentry;

	int ret;

	int ret;





	mutex_init(&mhi_bus.lock);

	mutex_init(&mhi_bus.lock);

	INIT_LIST_HEAD(&mhi_bus.controller_list);

	INIT_LIST_HEAD(&mhi_bus.controller_list);

	dentry = debugfs_create_dir("mhi", NULL);



	if (!IS_ERR_OR_NULL(dentry))

	/* parent directory */

		mhi_bus.dentry = dentry;

	debugfs_create_dir(mhi_bus_type.name, NULL);





	ret = bus_register(&mhi_bus_type);

	ret = bus_register(&mhi_bus_type);

drivers/bus/mhi/core/mhi_internal.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -626,7 +626,6 @@ struct mhi_timesync { 
struct mhi_bus {

struct mhi_bus {

	struct list_head controller_list;

	struct list_head controller_list;

	struct mutex lock;

	struct mutex lock;

	struct dentry *dentry;

};

};





/* default MHI timeout */

/* default MHI timeout */