diff options
| author | Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> | 2020-11-20 11:56:55 +0530 |
|---|---|---|
| committer | Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> | 2020-11-20 11:56:55 +0530 |
| commit | 7b7e4cee0299eddd73ea3874fa485a545a0ec2bc (patch) | |
| tree | 0dc1216178c9f2690856fe4b4356fc66d5b3a24a /drivers | |
| parent | 6cc1716102b55497dd557e8295a3177315332f9a (diff) | |
| parent | 2ca7e30d3b1ee370c96201e58f8c05ba2bdcd6d2 (diff) | |
| download | linux-7b7e4cee0299eddd73ea3874fa485a545a0ec2bc.tar.gz linux-7b7e4cee0299eddd73ea3874fa485a545a0ec2bc.tar.bz2 linux-7b7e4cee0299eddd73ea3874fa485a545a0ec2bc.zip | |
Merge branch 'mhi-ath11k-immutable' into mhi-next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/bus/mhi/core/init.c | 9 | ||||
| -rw-r--r-- | drivers/bus/mhi/core/internal.h | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath11k/mhi.c | 4 |
3 files changed, 0 insertions, 14 deletions
diff --git a/drivers/bus/mhi/core/init.c b/drivers/bus/mhi/core/init.c index 2534f1c9c153..655d539c6808 100644 --- a/drivers/bus/mhi/core/init.c +++ b/drivers/bus/mhi/core/init.c @@ -758,7 +758,6 @@ static int parse_ch_cfg(struct mhi_controller *mhi_cntrl, mhi_chan->offload_ch = ch_cfg->offload_channel; mhi_chan->db_cfg.reset_req = ch_cfg->doorbell_mode_switch; mhi_chan->pre_alloc = ch_cfg->auto_queue; - mhi_chan->auto_start = ch_cfg->auto_start; /* * If MHI host allocates buffers, then the channel direction @@ -1169,11 +1168,6 @@ static int mhi_driver_probe(struct device *dev) goto exit_probe; ul_chan->xfer_cb = mhi_drv->ul_xfer_cb; - if (ul_chan->auto_start) { - ret = mhi_prepare_channel(mhi_cntrl, ul_chan); - if (ret) - goto exit_probe; - } } ret = -EINVAL; @@ -1207,9 +1201,6 @@ static int mhi_driver_probe(struct device *dev) if (ret) goto exit_probe; - if (dl_chan && dl_chan->auto_start) - mhi_prepare_channel(mhi_cntrl, dl_chan); - mhi_device_put(mhi_dev); return ret; diff --git a/drivers/bus/mhi/core/internal.h b/drivers/bus/mhi/core/internal.h index 2df8de5432f9..6f80ec30c0cd 100644 --- a/drivers/bus/mhi/core/internal.h +++ b/drivers/bus/mhi/core/internal.h @@ -563,7 +563,6 @@ struct mhi_chan { bool configured; bool offload_ch; bool pre_alloc; - bool auto_start; bool wake_capable; }; diff --git a/drivers/net/wireless/ath/ath11k/mhi.c b/drivers/net/wireless/ath/ath11k/mhi.c index aded9a719d51..47a1ce1bee4f 100644 --- a/drivers/net/wireless/ath/ath11k/mhi.c +++ b/drivers/net/wireless/ath/ath11k/mhi.c @@ -24,7 +24,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = { .offload_channel = false, .doorbell_mode_switch = false, .auto_queue = false, - .auto_start = false, }, { .num = 1, @@ -39,7 +38,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = { .offload_channel = false, .doorbell_mode_switch = false, .auto_queue = false, - .auto_start = false, }, { .num = 20, @@ -54,7 +52,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = { .offload_channel = false, .doorbell_mode_switch = false, .auto_queue = false, - .auto_start = true, }, { .num = 21, @@ -69,7 +66,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = { .offload_channel = false, .doorbell_mode_switch = false, .auto_queue = true, - .auto_start = true, }, }; |