drivers/bus/mhi/host/main.c | 19 ------------------- drivers/bus/mhi/host/pm.c | 14 -------------- include/linux/mhi.h | 18 ------------------ 3 files changed, 51 deletions(-)
From: "Dr. David Alan Gilbert" <linux@treblig.org>
mhi_device_get() and mhi_queue_dma() haven't been used since 2020's
commit 189ff97cca53 ("bus: mhi: core: Add support for data transfer")
added them.
Remove them.
Note that mhi_queue_dma_sync() is used and has been left.
Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
---
drivers/bus/mhi/host/main.c | 19 -------------------
drivers/bus/mhi/host/pm.c | 14 --------------
include/linux/mhi.h | 18 ------------------
3 files changed, 51 deletions(-)
diff --git a/drivers/bus/mhi/host/main.c b/drivers/bus/mhi/host/main.c
index 4de75674f193..4c91ffd6ed0e 100644
--- a/drivers/bus/mhi/host/main.c
+++ b/drivers/bus/mhi/host/main.c
@@ -1181,25 +1181,6 @@ int mhi_queue_skb(struct mhi_device *mhi_dev, enum dma_data_direction dir,
}
EXPORT_SYMBOL_GPL(mhi_queue_skb);
-int mhi_queue_dma(struct mhi_device *mhi_dev, enum dma_data_direction dir,
- struct mhi_buf *mhi_buf, size_t len, enum mhi_flags mflags)
-{
- struct mhi_chan *mhi_chan = (dir == DMA_TO_DEVICE) ? mhi_dev->ul_chan :
- mhi_dev->dl_chan;
- struct mhi_buf_info buf_info = { };
-
- buf_info.p_addr = mhi_buf->dma_addr;
- buf_info.cb_buf = mhi_buf;
- buf_info.pre_mapped = true;
- buf_info.len = len;
-
- if (unlikely(mhi_chan->pre_alloc))
- return -EINVAL;
-
- return mhi_queue(mhi_dev, &buf_info, dir, mflags);
-}
-EXPORT_SYMBOL_GPL(mhi_queue_dma);
-
int mhi_gen_tre(struct mhi_controller *mhi_cntrl, struct mhi_chan *mhi_chan,
struct mhi_buf_info *info, enum mhi_flags flags)
{
diff --git a/drivers/bus/mhi/host/pm.c b/drivers/bus/mhi/host/pm.c
index 11c0e751f223..2fb27e6f8f88 100644
--- a/drivers/bus/mhi/host/pm.c
+++ b/drivers/bus/mhi/host/pm.c
@@ -1296,20 +1296,6 @@ int mhi_force_rddm_mode(struct mhi_controller *mhi_cntrl)
}
EXPORT_SYMBOL_GPL(mhi_force_rddm_mode);
-void mhi_device_get(struct mhi_device *mhi_dev)
-{
- struct mhi_controller *mhi_cntrl = mhi_dev->mhi_cntrl;
-
- mhi_dev->dev_wake++;
- read_lock_bh(&mhi_cntrl->pm_lock);
- if (MHI_PM_IN_SUSPEND_STATE(mhi_cntrl->pm_state))
- mhi_trigger_resume(mhi_cntrl);
-
- mhi_cntrl->wake_get(mhi_cntrl, true);
- read_unlock_bh(&mhi_cntrl->pm_lock);
-}
-EXPORT_SYMBOL_GPL(mhi_device_get);
-
int mhi_device_get_sync(struct mhi_device *mhi_dev)
{
struct mhi_controller *mhi_cntrl = mhi_dev->mhi_cntrl;
diff --git a/include/linux/mhi.h b/include/linux/mhi.h
index 059dc94d20bb..dd372b0123a6 100644
--- a/include/linux/mhi.h
+++ b/include/linux/mhi.h
@@ -720,12 +720,6 @@ enum mhi_state mhi_get_mhi_state(struct mhi_controller *mhi_cntrl);
*/
void mhi_soc_reset(struct mhi_controller *mhi_cntrl);
-/**
- * mhi_device_get - Disable device low power mode
- * @mhi_dev: Device associated with the channel
- */
-void mhi_device_get(struct mhi_device *mhi_dev);
-
/**
* mhi_device_get_sync - Disable device low power mode. Synchronously
* take the controller out of suspended state
@@ -776,18 +770,6 @@ int mhi_prepare_for_transfer_autoqueue(struct mhi_device *mhi_dev);
*/
void mhi_unprepare_from_transfer(struct mhi_device *mhi_dev);
-/**
- * mhi_queue_dma - Send or receive DMA mapped buffers from client device
- * over MHI channel
- * @mhi_dev: Device associated with the channels
- * @dir: DMA direction for the channel
- * @mhi_buf: Buffer for holding the DMA mapped data
- * @len: Buffer length
- * @mflags: MHI transfer flags used for the transfer
- */
-int mhi_queue_dma(struct mhi_device *mhi_dev, enum dma_data_direction dir,
- struct mhi_buf *mhi_buf, size_t len, enum mhi_flags mflags);
-
/**
* mhi_queue_buf - Send or receive raw buffers from client device over MHI
* channel
--
2.48.1On Mon, Jan 27, 2025 at 09:58:59PM +0000, linux@treblig.org wrote:
> From: "Dr. David Alan Gilbert" <linux@treblig.org>
>
> mhi_device_get() and mhi_queue_dma() haven't been used since 2020's
> commit 189ff97cca53 ("bus: mhi: core: Add support for data transfer")
> added them.
>
> Remove them.
>
> Note that mhi_queue_dma_sync() is used and has been left.
>
> Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Applied to mhi-next!
- Mani
> ---
> drivers/bus/mhi/host/main.c | 19 -------------------
> drivers/bus/mhi/host/pm.c | 14 --------------
> include/linux/mhi.h | 18 ------------------
> 3 files changed, 51 deletions(-)
>
> diff --git a/drivers/bus/mhi/host/main.c b/drivers/bus/mhi/host/main.c
> index 4de75674f193..4c91ffd6ed0e 100644
> --- a/drivers/bus/mhi/host/main.c
> +++ b/drivers/bus/mhi/host/main.c
> @@ -1181,25 +1181,6 @@ int mhi_queue_skb(struct mhi_device *mhi_dev, enum dma_data_direction dir,
> }
> EXPORT_SYMBOL_GPL(mhi_queue_skb);
>
> -int mhi_queue_dma(struct mhi_device *mhi_dev, enum dma_data_direction dir,
> - struct mhi_buf *mhi_buf, size_t len, enum mhi_flags mflags)
> -{
> - struct mhi_chan *mhi_chan = (dir == DMA_TO_DEVICE) ? mhi_dev->ul_chan :
> - mhi_dev->dl_chan;
> - struct mhi_buf_info buf_info = { };
> -
> - buf_info.p_addr = mhi_buf->dma_addr;
> - buf_info.cb_buf = mhi_buf;
> - buf_info.pre_mapped = true;
> - buf_info.len = len;
> -
> - if (unlikely(mhi_chan->pre_alloc))
> - return -EINVAL;
> -
> - return mhi_queue(mhi_dev, &buf_info, dir, mflags);
> -}
> -EXPORT_SYMBOL_GPL(mhi_queue_dma);
> -
> int mhi_gen_tre(struct mhi_controller *mhi_cntrl, struct mhi_chan *mhi_chan,
> struct mhi_buf_info *info, enum mhi_flags flags)
> {
> diff --git a/drivers/bus/mhi/host/pm.c b/drivers/bus/mhi/host/pm.c
> index 11c0e751f223..2fb27e6f8f88 100644
> --- a/drivers/bus/mhi/host/pm.c
> +++ b/drivers/bus/mhi/host/pm.c
> @@ -1296,20 +1296,6 @@ int mhi_force_rddm_mode(struct mhi_controller *mhi_cntrl)
> }
> EXPORT_SYMBOL_GPL(mhi_force_rddm_mode);
>
> -void mhi_device_get(struct mhi_device *mhi_dev)
> -{
> - struct mhi_controller *mhi_cntrl = mhi_dev->mhi_cntrl;
> -
> - mhi_dev->dev_wake++;
> - read_lock_bh(&mhi_cntrl->pm_lock);
> - if (MHI_PM_IN_SUSPEND_STATE(mhi_cntrl->pm_state))
> - mhi_trigger_resume(mhi_cntrl);
> -
> - mhi_cntrl->wake_get(mhi_cntrl, true);
> - read_unlock_bh(&mhi_cntrl->pm_lock);
> -}
> -EXPORT_SYMBOL_GPL(mhi_device_get);
> -
> int mhi_device_get_sync(struct mhi_device *mhi_dev)
> {
> struct mhi_controller *mhi_cntrl = mhi_dev->mhi_cntrl;
> diff --git a/include/linux/mhi.h b/include/linux/mhi.h
> index 059dc94d20bb..dd372b0123a6 100644
> --- a/include/linux/mhi.h
> +++ b/include/linux/mhi.h
> @@ -720,12 +720,6 @@ enum mhi_state mhi_get_mhi_state(struct mhi_controller *mhi_cntrl);
> */
> void mhi_soc_reset(struct mhi_controller *mhi_cntrl);
>
> -/**
> - * mhi_device_get - Disable device low power mode
> - * @mhi_dev: Device associated with the channel
> - */
> -void mhi_device_get(struct mhi_device *mhi_dev);
> -
> /**
> * mhi_device_get_sync - Disable device low power mode. Synchronously
> * take the controller out of suspended state
> @@ -776,18 +770,6 @@ int mhi_prepare_for_transfer_autoqueue(struct mhi_device *mhi_dev);
> */
> void mhi_unprepare_from_transfer(struct mhi_device *mhi_dev);
>
> -/**
> - * mhi_queue_dma - Send or receive DMA mapped buffers from client device
> - * over MHI channel
> - * @mhi_dev: Device associated with the channels
> - * @dir: DMA direction for the channel
> - * @mhi_buf: Buffer for holding the DMA mapped data
> - * @len: Buffer length
> - * @mflags: MHI transfer flags used for the transfer
> - */
> -int mhi_queue_dma(struct mhi_device *mhi_dev, enum dma_data_direction dir,
> - struct mhi_buf *mhi_buf, size_t len, enum mhi_flags mflags);
> -
> /**
> * mhi_queue_buf - Send or receive raw buffers from client device over MHI
> * channel
> --
> 2.48.1
>
--
மணிவண்ணன் சதாசிவம்
On Mon, Jan 27, 2025 at 09:58:59PM +0000, linux@treblig.org wrote:
> From: "Dr. David Alan Gilbert" <linux@treblig.org>
>
Subject prefix should be:
'bus: mhi: host:"
> mhi_device_get() and mhi_queue_dma() haven't been used since 2020's
> commit 189ff97cca53 ("bus: mhi: core: Add support for data transfer")
> added them.
>
> Remove them.
>
> Note that mhi_queue_dma_sync() is used and has been left.
>
> Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
- Mani
> ---
> drivers/bus/mhi/host/main.c | 19 -------------------
> drivers/bus/mhi/host/pm.c | 14 --------------
> include/linux/mhi.h | 18 ------------------
> 3 files changed, 51 deletions(-)
>
> diff --git a/drivers/bus/mhi/host/main.c b/drivers/bus/mhi/host/main.c
> index 4de75674f193..4c91ffd6ed0e 100644
> --- a/drivers/bus/mhi/host/main.c
> +++ b/drivers/bus/mhi/host/main.c
> @@ -1181,25 +1181,6 @@ int mhi_queue_skb(struct mhi_device *mhi_dev, enum dma_data_direction dir,
> }
> EXPORT_SYMBOL_GPL(mhi_queue_skb);
>
> -int mhi_queue_dma(struct mhi_device *mhi_dev, enum dma_data_direction dir,
> - struct mhi_buf *mhi_buf, size_t len, enum mhi_flags mflags)
> -{
> - struct mhi_chan *mhi_chan = (dir == DMA_TO_DEVICE) ? mhi_dev->ul_chan :
> - mhi_dev->dl_chan;
> - struct mhi_buf_info buf_info = { };
> -
> - buf_info.p_addr = mhi_buf->dma_addr;
> - buf_info.cb_buf = mhi_buf;
> - buf_info.pre_mapped = true;
> - buf_info.len = len;
> -
> - if (unlikely(mhi_chan->pre_alloc))
> - return -EINVAL;
> -
> - return mhi_queue(mhi_dev, &buf_info, dir, mflags);
> -}
> -EXPORT_SYMBOL_GPL(mhi_queue_dma);
> -
> int mhi_gen_tre(struct mhi_controller *mhi_cntrl, struct mhi_chan *mhi_chan,
> struct mhi_buf_info *info, enum mhi_flags flags)
> {
> diff --git a/drivers/bus/mhi/host/pm.c b/drivers/bus/mhi/host/pm.c
> index 11c0e751f223..2fb27e6f8f88 100644
> --- a/drivers/bus/mhi/host/pm.c
> +++ b/drivers/bus/mhi/host/pm.c
> @@ -1296,20 +1296,6 @@ int mhi_force_rddm_mode(struct mhi_controller *mhi_cntrl)
> }
> EXPORT_SYMBOL_GPL(mhi_force_rddm_mode);
>
> -void mhi_device_get(struct mhi_device *mhi_dev)
> -{
> - struct mhi_controller *mhi_cntrl = mhi_dev->mhi_cntrl;
> -
> - mhi_dev->dev_wake++;
> - read_lock_bh(&mhi_cntrl->pm_lock);
> - if (MHI_PM_IN_SUSPEND_STATE(mhi_cntrl->pm_state))
> - mhi_trigger_resume(mhi_cntrl);
> -
> - mhi_cntrl->wake_get(mhi_cntrl, true);
> - read_unlock_bh(&mhi_cntrl->pm_lock);
> -}
> -EXPORT_SYMBOL_GPL(mhi_device_get);
> -
> int mhi_device_get_sync(struct mhi_device *mhi_dev)
> {
> struct mhi_controller *mhi_cntrl = mhi_dev->mhi_cntrl;
> diff --git a/include/linux/mhi.h b/include/linux/mhi.h
> index 059dc94d20bb..dd372b0123a6 100644
> --- a/include/linux/mhi.h
> +++ b/include/linux/mhi.h
> @@ -720,12 +720,6 @@ enum mhi_state mhi_get_mhi_state(struct mhi_controller *mhi_cntrl);
> */
> void mhi_soc_reset(struct mhi_controller *mhi_cntrl);
>
> -/**
> - * mhi_device_get - Disable device low power mode
> - * @mhi_dev: Device associated with the channel
> - */
> -void mhi_device_get(struct mhi_device *mhi_dev);
> -
> /**
> * mhi_device_get_sync - Disable device low power mode. Synchronously
> * take the controller out of suspended state
> @@ -776,18 +770,6 @@ int mhi_prepare_for_transfer_autoqueue(struct mhi_device *mhi_dev);
> */
> void mhi_unprepare_from_transfer(struct mhi_device *mhi_dev);
>
> -/**
> - * mhi_queue_dma - Send or receive DMA mapped buffers from client device
> - * over MHI channel
> - * @mhi_dev: Device associated with the channels
> - * @dir: DMA direction for the channel
> - * @mhi_buf: Buffer for holding the DMA mapped data
> - * @len: Buffer length
> - * @mflags: MHI transfer flags used for the transfer
> - */
> -int mhi_queue_dma(struct mhi_device *mhi_dev, enum dma_data_direction dir,
> - struct mhi_buf *mhi_buf, size_t len, enum mhi_flags mflags);
> -
> /**
> * mhi_queue_buf - Send or receive raw buffers from client device over MHI
> * channel
> --
> 2.48.1
>
--
மணிவண்ணன் சதாசிவம்
* Manivannan Sadhasivam (manivannan.sadhasivam@linaro.org) wrote:
> On Mon, Jan 27, 2025 at 09:58:59PM +0000, linux@treblig.org wrote:
> > From: "Dr. David Alan Gilbert" <linux@treblig.org>
> >
>
> Subject prefix should be:
>
> 'bus: mhi: host:"
Ah, do you need me to post a v2 for that?
>
> > mhi_device_get() and mhi_queue_dma() haven't been used since 2020's
> > commit 189ff97cca53 ("bus: mhi: core: Add support for data transfer")
> > added them.
> >
> > Remove them.
> >
> > Note that mhi_queue_dma_sync() is used and has been left.
> >
> > Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
>
> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Thanks,
Dave
> - Mani
>
> > ---
> > drivers/bus/mhi/host/main.c | 19 -------------------
> > drivers/bus/mhi/host/pm.c | 14 --------------
> > include/linux/mhi.h | 18 ------------------
> > 3 files changed, 51 deletions(-)
> >
> > diff --git a/drivers/bus/mhi/host/main.c b/drivers/bus/mhi/host/main.c
> > index 4de75674f193..4c91ffd6ed0e 100644
> > --- a/drivers/bus/mhi/host/main.c
> > +++ b/drivers/bus/mhi/host/main.c
> > @@ -1181,25 +1181,6 @@ int mhi_queue_skb(struct mhi_device *mhi_dev, enum dma_data_direction dir,
> > }
> > EXPORT_SYMBOL_GPL(mhi_queue_skb);
> >
> > -int mhi_queue_dma(struct mhi_device *mhi_dev, enum dma_data_direction dir,
> > - struct mhi_buf *mhi_buf, size_t len, enum mhi_flags mflags)
> > -{
> > - struct mhi_chan *mhi_chan = (dir == DMA_TO_DEVICE) ? mhi_dev->ul_chan :
> > - mhi_dev->dl_chan;
> > - struct mhi_buf_info buf_info = { };
> > -
> > - buf_info.p_addr = mhi_buf->dma_addr;
> > - buf_info.cb_buf = mhi_buf;
> > - buf_info.pre_mapped = true;
> > - buf_info.len = len;
> > -
> > - if (unlikely(mhi_chan->pre_alloc))
> > - return -EINVAL;
> > -
> > - return mhi_queue(mhi_dev, &buf_info, dir, mflags);
> > -}
> > -EXPORT_SYMBOL_GPL(mhi_queue_dma);
> > -
> > int mhi_gen_tre(struct mhi_controller *mhi_cntrl, struct mhi_chan *mhi_chan,
> > struct mhi_buf_info *info, enum mhi_flags flags)
> > {
> > diff --git a/drivers/bus/mhi/host/pm.c b/drivers/bus/mhi/host/pm.c
> > index 11c0e751f223..2fb27e6f8f88 100644
> > --- a/drivers/bus/mhi/host/pm.c
> > +++ b/drivers/bus/mhi/host/pm.c
> > @@ -1296,20 +1296,6 @@ int mhi_force_rddm_mode(struct mhi_controller *mhi_cntrl)
> > }
> > EXPORT_SYMBOL_GPL(mhi_force_rddm_mode);
> >
> > -void mhi_device_get(struct mhi_device *mhi_dev)
> > -{
> > - struct mhi_controller *mhi_cntrl = mhi_dev->mhi_cntrl;
> > -
> > - mhi_dev->dev_wake++;
> > - read_lock_bh(&mhi_cntrl->pm_lock);
> > - if (MHI_PM_IN_SUSPEND_STATE(mhi_cntrl->pm_state))
> > - mhi_trigger_resume(mhi_cntrl);
> > -
> > - mhi_cntrl->wake_get(mhi_cntrl, true);
> > - read_unlock_bh(&mhi_cntrl->pm_lock);
> > -}
> > -EXPORT_SYMBOL_GPL(mhi_device_get);
> > -
> > int mhi_device_get_sync(struct mhi_device *mhi_dev)
> > {
> > struct mhi_controller *mhi_cntrl = mhi_dev->mhi_cntrl;
> > diff --git a/include/linux/mhi.h b/include/linux/mhi.h
> > index 059dc94d20bb..dd372b0123a6 100644
> > --- a/include/linux/mhi.h
> > +++ b/include/linux/mhi.h
> > @@ -720,12 +720,6 @@ enum mhi_state mhi_get_mhi_state(struct mhi_controller *mhi_cntrl);
> > */
> > void mhi_soc_reset(struct mhi_controller *mhi_cntrl);
> >
> > -/**
> > - * mhi_device_get - Disable device low power mode
> > - * @mhi_dev: Device associated with the channel
> > - */
> > -void mhi_device_get(struct mhi_device *mhi_dev);
> > -
> > /**
> > * mhi_device_get_sync - Disable device low power mode. Synchronously
> > * take the controller out of suspended state
> > @@ -776,18 +770,6 @@ int mhi_prepare_for_transfer_autoqueue(struct mhi_device *mhi_dev);
> > */
> > void mhi_unprepare_from_transfer(struct mhi_device *mhi_dev);
> >
> > -/**
> > - * mhi_queue_dma - Send or receive DMA mapped buffers from client device
> > - * over MHI channel
> > - * @mhi_dev: Device associated with the channels
> > - * @dir: DMA direction for the channel
> > - * @mhi_buf: Buffer for holding the DMA mapped data
> > - * @len: Buffer length
> > - * @mflags: MHI transfer flags used for the transfer
> > - */
> > -int mhi_queue_dma(struct mhi_device *mhi_dev, enum dma_data_direction dir,
> > - struct mhi_buf *mhi_buf, size_t len, enum mhi_flags mflags);
> > -
> > /**
> > * mhi_queue_buf - Send or receive raw buffers from client device over MHI
> > * channel
> > --
> > 2.48.1
> >
>
> --
> மணிவண்ணன் சதாசிவம்
--
-----Open up your eyes, open up your mind, open up your code -------
/ Dr. David Alan Gilbert | Running GNU/Linux | Happy \
\ dave @ treblig.org | | In Hex /
\ _________________________|_____ http://www.treblig.org |_______/
On Sat, Feb 01, 2025 at 05:48:10PM +0000, Dr. David Alan Gilbert wrote: > * Manivannan Sadhasivam (manivannan.sadhasivam@linaro.org) wrote: > > On Mon, Jan 27, 2025 at 09:58:59PM +0000, linux@treblig.org wrote: > > > From: "Dr. David Alan Gilbert" <linux@treblig.org> > > > > > > > Subject prefix should be: > > > > 'bus: mhi: host:" > > Ah, do you need me to post a v2 for that? No need. I will ammend it while applying. - Mani -- மணிவண்ணன் சதாசிவம்
* Manivannan Sadhasivam (manivannan.sadhasivam@linaro.org) wrote: > On Sat, Feb 01, 2025 at 05:48:10PM +0000, Dr. David Alan Gilbert wrote: > > * Manivannan Sadhasivam (manivannan.sadhasivam@linaro.org) wrote: > > > On Mon, Jan 27, 2025 at 09:58:59PM +0000, linux@treblig.org wrote: > > > > From: "Dr. David Alan Gilbert" <linux@treblig.org> > > > > > > > > > > Subject prefix should be: > > > > > > 'bus: mhi: host:" > > > > Ah, do you need me to post a v2 for that? > > No need. I will ammend it while applying. Thanks! Dave > - Mani > > -- > மணிவண்ணன் சதாசிவம் -- -----Open up your eyes, open up your mind, open up your code ------- / Dr. David Alan Gilbert | Running GNU/Linux | Happy \ \ dave @ treblig.org | | In Hex / \ _________________________|_____ http://www.treblig.org |_______/
On 1/27/2025 2:58 PM, linux@treblig.org wrote:
> From: "Dr. David Alan Gilbert" <linux@treblig.org>
>
> mhi_device_get() and mhi_queue_dma() haven't been used since 2020's
> commit 189ff97cca53 ("bus: mhi: core: Add support for data transfer")
> added them.
>
> Remove them.
I suppose it is time to remove them.
> Note that mhi_queue_dma_sync() is used and has been left.
Does it make sense to drop the "sync" postfix since the remaining
function does not need to distinguish from another implementation?
-Jeff
© 2016 - 2026 Red Hat, Inc.