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

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

Merge "mhi: core: remove unused timesync device"

parents 7b145809 e197a69c

drivers/bus/mhi/core/mhi_init.c

+0 −4
Original line number Diff line number Diff line
@@ -1850,10 +1850,6 @@ static int mhi_driver_remove(struct device *dev) 
		mutex_unlock(&mhi_chan->mutex);

	}





	if (mhi_cntrl->tsync_dev == mhi_dev)

		mhi_cntrl->tsync_dev = NULL;



	/* relinquish any pending votes for device */

	while (atomic_read(&mhi_dev->dev_vote))

		mhi_device_put(mhi_dev, MHI_VOTE_DEVICE);

drivers/bus/mhi/core/mhi_main.c

+0 −39
Original line number Diff line number Diff line
@@ -852,38 +852,6 @@ int mhi_create_timesync_sysfs(struct mhi_controller *mhi_cntrl) 
				  &mhi_tsync_group);

}



static void mhi_create_time_sync_dev(struct mhi_controller *mhi_cntrl)

{

	struct mhi_device *mhi_dev;

	int ret;



	if (!MHI_IN_MISSION_MODE(mhi_cntrl->ee))

		return;



	mhi_dev = mhi_alloc_device(mhi_cntrl);

	if (!mhi_dev)

		return;



	mhi_dev->dev_type = MHI_TIMESYNC_TYPE;

	mhi_dev->chan_name = "TIME_SYNC";

	dev_set_name(&mhi_dev->dev, "%04x_%02u.%02u.%02u_%s", mhi_dev->dev_id,

		     mhi_dev->domain, mhi_dev->bus, mhi_dev->slot,

		     mhi_dev->chan_name);



	/* add if there is a matching DT node */

	mhi_assign_of_node(mhi_cntrl, mhi_dev);



	ret = device_add(&mhi_dev->dev);

	if (ret) {

		MHI_ERR("Failed to register dev for  chan:%s\n",

			mhi_dev->chan_name);

		mhi_dealloc_device(mhi_cntrl, mhi_dev);

		return;

	}



	mhi_cntrl->tsync_dev = mhi_dev;

}



/* bind mhi channels into mhi devices */

void mhi_create_devices(struct mhi_controller *mhi_cntrl)

{
@@ -892,13 +860,6 @@ void mhi_create_devices(struct mhi_controller *mhi_cntrl) 
	struct mhi_device *mhi_dev;

	int ret;



	/*

	 * we need to create time sync device before creating other

	 * devices, because client may try to capture time during

	 * clint probe.

	 */

	mhi_create_time_sync_dev(mhi_cntrl);



	mhi_chan = mhi_cntrl->mhi_chan;

	for (i = 0; i < mhi_cntrl->max_chan; i++, mhi_chan++) {

		if (!mhi_chan->configured || mhi_chan->mhi_dev ||

drivers/bus/mhi/core/mhi_pm.c

+3 −3
Original line number Diff line number Diff line
@@ -533,14 +533,14 @@ static int mhi_pm_mission_mode_transition(struct mhi_controller *mhi_cntrl) 


	mhi_special_events_pending(mhi_cntrl);



	/* setup sysfs nodes for userspace votes */

	mhi_create_sysfs(mhi_cntrl);



	MHI_LOG("Adding new devices\n");



	/* add supported devices */

	mhi_create_devices(mhi_cntrl);



	/* setup sysfs nodes for userspace votes */

	mhi_create_sysfs(mhi_cntrl);



	read_lock_bh(&mhi_cntrl->pm_lock);



error_mission_mode:

include/linux/mhi.h

+0 −1
Original line number Diff line number Diff line
@@ -382,7 +382,6 @@ struct mhi_controller { 


	/* supports time sync feature */

	struct mhi_timesync *mhi_tsync;

	struct mhi_device *tsync_dev;

	u64 local_timer_freq;

	u64 remote_timer_freq;