* [PATCH] dmaengine: Mark dma_request_slave_channel() deprecated
@ 2020-08-28 11:05 Peter Ujfalusi
2020-08-28 11:32 ` Andy Shevchenko
2020-09-03 6:51 ` Vinod Koul
0 siblings, 2 replies; 3+ messages in thread
From: Peter Ujfalusi @ 2020-08-28 11:05 UTC (permalink / raw)
To: vkoul; +Cc: dmaengine, dan.j.williams, linux-kernel, andy.shevchenko
New drivers should use dma_request_chan() instead
dma_request_slave_channel()
dma_request_slave_channel() is a simple wrapper for dma_request_chan()
eating up the error code for channel request failure and makes deferred
probing impossible.
Move the dma_request_slave_channel() into the header as inline function,
mark it as deprecated.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/dma/dmaengine.c | 18 ------------------
include/linux/dmaengine.h | 15 +++++++++------
2 files changed, 9 insertions(+), 24 deletions(-)
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index a53e71d2bbd4..ac8ef6cf7626 100644
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -871,24 +871,6 @@ struct dma_chan *dma_request_chan(struct device *dev, const char *name)
}
EXPORT_SYMBOL_GPL(dma_request_chan);
-/**
- * dma_request_slave_channel - try to allocate an exclusive slave channel
- * @dev: pointer to client device structure
- * @name: slave channel name
- *
- * Returns pointer to appropriate DMA channel on success or NULL.
- */
-struct dma_chan *dma_request_slave_channel(struct device *dev,
- const char *name)
-{
- struct dma_chan *ch = dma_request_chan(dev, name);
- if (IS_ERR(ch))
- return NULL;
-
- return ch;
-}
-EXPORT_SYMBOL_GPL(dma_request_slave_channel);
-
/**
* dma_request_chan_by_mask - allocate a channel satisfying certain capabilities
* @mask: capabilities that the channel must satisfy
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 011371b7f081..dd357a747780 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -1472,7 +1472,6 @@ void dma_issue_pending_all(void);
struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask,
dma_filter_fn fn, void *fn_param,
struct device_node *np);
-struct dma_chan *dma_request_slave_channel(struct device *dev, const char *name);
struct dma_chan *dma_request_chan(struct device *dev, const char *name);
struct dma_chan *dma_request_chan_by_mask(const dma_cap_mask_t *mask);
@@ -1502,11 +1501,6 @@ static inline struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask,
{
return NULL;
}
-static inline struct dma_chan *dma_request_slave_channel(struct device *dev,
- const char *name)
-{
- return NULL;
-}
static inline struct dma_chan *dma_request_chan(struct device *dev,
const char *name)
{
@@ -1575,6 +1569,15 @@ void dma_run_dependencies(struct dma_async_tx_descriptor *tx);
#define dma_request_channel(mask, x, y) \
__dma_request_channel(&(mask), x, y, NULL)
+/* Deprecated, please use dma_request_chan() directly */
+static inline struct dma_chan * __deprecated
+dma_request_slave_channel(struct device *dev, const char *name)
+{
+ struct dma_chan *ch = dma_request_chan(dev, name);
+
+ return IS_ERR(ch) ? NULL : ch;
+}
+
static inline struct dma_chan
*dma_request_slave_channel_compat(const dma_cap_mask_t mask,
dma_filter_fn fn, void *fn_param,
--
Peter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] dmaengine: Mark dma_request_slave_channel() deprecated
2020-08-28 11:05 [PATCH] dmaengine: Mark dma_request_slave_channel() deprecated Peter Ujfalusi
@ 2020-08-28 11:32 ` Andy Shevchenko
2020-09-03 6:51 ` Vinod Koul
1 sibling, 0 replies; 3+ messages in thread
From: Andy Shevchenko @ 2020-08-28 11:32 UTC (permalink / raw)
To: Peter Ujfalusi
Cc: Vinod Koul, dmaengine, Dan Williams, Linux Kernel Mailing List
On Fri, Aug 28, 2020 at 2:03 PM Peter Ujfalusi <peter.ujfalusi@ti.com> wrote:
>
> New drivers should use dma_request_chan() instead
> dma_request_slave_channel()
>
> dma_request_slave_channel() is a simple wrapper for dma_request_chan()
> eating up the error code for channel request failure and makes deferred
> probing impossible.
>
> Move the dma_request_slave_channel() into the header as inline function,
> mark it as deprecated.
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Thanks for this vector of cleaning!
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> ---
> drivers/dma/dmaengine.c | 18 ------------------
> include/linux/dmaengine.h | 15 +++++++++------
> 2 files changed, 9 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
> index a53e71d2bbd4..ac8ef6cf7626 100644
> --- a/drivers/dma/dmaengine.c
> +++ b/drivers/dma/dmaengine.c
> @@ -871,24 +871,6 @@ struct dma_chan *dma_request_chan(struct device *dev, const char *name)
> }
> EXPORT_SYMBOL_GPL(dma_request_chan);
>
> -/**
> - * dma_request_slave_channel - try to allocate an exclusive slave channel
> - * @dev: pointer to client device structure
> - * @name: slave channel name
> - *
> - * Returns pointer to appropriate DMA channel on success or NULL.
> - */
> -struct dma_chan *dma_request_slave_channel(struct device *dev,
> - const char *name)
> -{
> - struct dma_chan *ch = dma_request_chan(dev, name);
> - if (IS_ERR(ch))
> - return NULL;
> -
> - return ch;
> -}
> -EXPORT_SYMBOL_GPL(dma_request_slave_channel);
> -
> /**
> * dma_request_chan_by_mask - allocate a channel satisfying certain capabilities
> * @mask: capabilities that the channel must satisfy
> diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
> index 011371b7f081..dd357a747780 100644
> --- a/include/linux/dmaengine.h
> +++ b/include/linux/dmaengine.h
> @@ -1472,7 +1472,6 @@ void dma_issue_pending_all(void);
> struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask,
> dma_filter_fn fn, void *fn_param,
> struct device_node *np);
> -struct dma_chan *dma_request_slave_channel(struct device *dev, const char *name);
>
> struct dma_chan *dma_request_chan(struct device *dev, const char *name);
> struct dma_chan *dma_request_chan_by_mask(const dma_cap_mask_t *mask);
> @@ -1502,11 +1501,6 @@ static inline struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask,
> {
> return NULL;
> }
> -static inline struct dma_chan *dma_request_slave_channel(struct device *dev,
> - const char *name)
> -{
> - return NULL;
> -}
> static inline struct dma_chan *dma_request_chan(struct device *dev,
> const char *name)
> {
> @@ -1575,6 +1569,15 @@ void dma_run_dependencies(struct dma_async_tx_descriptor *tx);
> #define dma_request_channel(mask, x, y) \
> __dma_request_channel(&(mask), x, y, NULL)
>
> +/* Deprecated, please use dma_request_chan() directly */
> +static inline struct dma_chan * __deprecated
> +dma_request_slave_channel(struct device *dev, const char *name)
> +{
> + struct dma_chan *ch = dma_request_chan(dev, name);
> +
> + return IS_ERR(ch) ? NULL : ch;
> +}
> +
> static inline struct dma_chan
> *dma_request_slave_channel_compat(const dma_cap_mask_t mask,
> dma_filter_fn fn, void *fn_param,
> --
> Peter
>
> Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
> Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
>
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] dmaengine: Mark dma_request_slave_channel() deprecated
2020-08-28 11:05 [PATCH] dmaengine: Mark dma_request_slave_channel() deprecated Peter Ujfalusi
2020-08-28 11:32 ` Andy Shevchenko
@ 2020-09-03 6:51 ` Vinod Koul
1 sibling, 0 replies; 3+ messages in thread
From: Vinod Koul @ 2020-09-03 6:51 UTC (permalink / raw)
To: Peter Ujfalusi; +Cc: dmaengine, dan.j.williams, linux-kernel, andy.shevchenko
On 28-08-20, 14:05, Peter Ujfalusi wrote:
> New drivers should use dma_request_chan() instead
> dma_request_slave_channel()
>
> dma_request_slave_channel() is a simple wrapper for dma_request_chan()
> eating up the error code for channel request failure and makes deferred
> probing impossible.
>
> Move the dma_request_slave_channel() into the header as inline function,
> mark it as deprecated.
Applied, thanks
--
~Vinod
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-09-03 6:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-28 11:05 [PATCH] dmaengine: Mark dma_request_slave_channel() deprecated Peter Ujfalusi
2020-08-28 11:32 ` Andy Shevchenko
2020-09-03 6:51 ` Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).