p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dma: dw: improve comparison with ~0 

In general ~0 does not fit some integer types. Let's do a helper to make a
comparison with that constant properly.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
This commit is contained in:
Andy Shevchenko 2013-07-15 15:04:38 +03:00 committed by Vinod Koul
parent be480dcbb5
commit 78f3c9d2e0
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/dma/dw/core.c
View File

@ -37,16 +37,22 @@
* which does not support descriptor writeback. * which does not support descriptor writeback.
*/ */
static inline bool is_request_line_unset(struct dw_dma_chan *dwc)
{
return dwc->request_line == (typeof(dwc->request_line))~0;
}
static inline void dwc_set_masters(struct dw_dma_chan *dwc) static inline void dwc_set_masters(struct dw_dma_chan *dwc)
{ {
struct dw_dma *dw = to_dw_dma(dwc->chan.device); struct dw_dma *dw = to_dw_dma(dwc->chan.device);
struct dw_dma_slave *dws = dwc->chan.private; struct dw_dma_slave *dws = dwc->chan.private;
unsigned char mmax = dw->nr_masters - 1; unsigned char mmax = dw->nr_masters - 1;
if (dwc->request_line == ~0) { if (!is_request_line_unset(dwc))
dwc->src_master = min_t(unsigned char, mmax, dwc_get_sms(dws)); return;
dwc->dst_master = min_t(unsigned char, mmax, dwc_get_dms(dws));
} dwc->src_master = min_t(unsigned char, mmax, dwc_get_sms(dws));
dwc->dst_master = min_t(unsigned char, mmax, dwc_get_dms(dws));
} }
#define DWC_DEFAULT_CTLLO(_chan) ({ \ #define DWC_DEFAULT_CTLLO(_chan) ({ \
@ -984,7 +990,7 @@ set_runtime_config(struct dma_chan *chan, struct dma_slave_config *sconfig)
dwc->direction = sconfig->direction; dwc->direction = sconfig->direction;
/* Take the request line from slave_id member */ /* Take the request line from slave_id member */
if (dwc->request_line == ~0) if (is_request_line_unset(dwc))
dwc->request_line = sconfig->slave_id; dwc->request_line = sconfig->slave_id;
convert_burst(&dwc->dma_sconfig.src_maxburst); convert_burst(&dwc->dma_sconfig.src_maxburst);