A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 23:24:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacmn: Fix clang warnings implicit enum qdf_dma_data_direction

Browse source 
warning: implicit conversion from enumeration type 'enum
 qdf_dma_data_direction' to different enumeration type 'enum
 dma_data_direction' [-Wenum-conversion]

Change-Id: I181a448c48e8975025e67c2fc5ef44d3022ff1a0
CRs-Fixed: 2055513
This commit is contained in:
Srinivas Girigowda 2017-06-08 21:43:55 -07:00 • committed by snandini
commit 7dacc4efe3
2 changed files with 39 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
qdf/linux/src/i_qdf_mem.h
View file

@ -134,6 +134,29 @@ static inline uint32_t __qdf_str_lcopy(char *dest, const char *src,
return strlcpy(dest, src, bytes);
}
/**
* __qdf_dma_dir_to_os() - Convert DMA data direction to OS specific enum
* @dir: QDF DMA data direction
*
* Return:
* enum dma_data_direction
*/
static inline
enum dma_data_direction __qdf_dma_dir_to_os(qdf_dma_dir_t qdf_dir)
{
switch (qdf_dir) {
case QDF_DMA_BIDIRECTIONAL:
return DMA_BIDIRECTIONAL;
case QDF_DMA_TO_DEVICE:
return DMA_TO_DEVICE;
case QDF_DMA_FROM_DEVICE:
return DMA_FROM_DEVICE;
default:
return DMA_NONE;
}
}
/**
* __qdf_mem_map_nbytes_single - Map memory for DMA
* @osdev: pomter OS device context
@ -150,7 +173,8 @@ static inline uint32_t __qdf_mem_map_nbytes_single(qdf_device_t osdev,
qdf_dma_addr_t *phy_addr)
{
/* assume that the OS only provides a single fragment */
*phy_addr = dma_map_single(osdev->dev, buf, nbytes, dir);
*phy_addr = dma_map_single(osdev->dev, buf, nbytes,
__qdf_dma_dir_to_os(dir));
return dma_mapping_error(osdev->dev, *phy_addr) ?
QDF_STATUS_E_FAILURE : QDF_STATUS_SUCCESS;
}
@ -169,7 +193,8 @@ static inline void __qdf_mem_unmap_nbytes_single(qdf_device_t osdev,
qdf_dma_addr_t phy_addr,
qdf_dma_dir_t dir, int nbytes)
{
dma_unmap_single(osdev->dev, phy_addr, nbytes, dir);
dma_unmap_single(osdev->dev, phy_addr, nbytes,
__qdf_dma_dir_to_os(dir));
}
#ifdef __KERNEL__

20
qdf/linux/src/qdf_nbuf.c
View file

@ -408,7 +408,8 @@ __qdf_nbuf_map_single(qdf_device_t osdev, qdf_nbuf_t buf, qdf_dma_dir_t dir)
/* assume that the OS only provides a single fragment */
QDF_NBUF_CB_PADDR(buf) = paddr =
dma_map_single(osdev->dev, buf->data,
skb_end_pointer(buf) - buf->data, dir);
skb_end_pointer(buf) - buf->data,
__qdf_dma_dir_to_os(dir));
return dma_mapping_error(osdev->dev, paddr)
? QDF_STATUS_E_FAILURE
: QDF_STATUS_SUCCESS;
@ -434,7 +435,8 @@ void __qdf_nbuf_unmap_single(qdf_device_t osdev, qdf_nbuf_t buf,
{
if (QDF_NBUF_CB_PADDR(buf))
dma_unmap_single(osdev->dev, QDF_NBUF_CB_PADDR(buf),
skb_end_pointer(buf) - buf->data, dir);
skb_end_pointer(buf) - buf->data,
__qdf_dma_dir_to_os(dir));
}
#endif
EXPORT_SYMBOL(__qdf_nbuf_unmap_single);
@ -2079,7 +2081,7 @@ void __qdf_nbuf_unmap_tso_segment(qdf_device_t osdev,
dma_unmap_single(osdev->dev,
tso_seg->seg.tso_frags[num_frags].paddr,
tso_seg->seg.tso_frags[num_frags].length,
QDF_DMA_TO_DEVICE);
__qdf_dma_dir_to_os(QDF_DMA_TO_DEVICE));
tso_seg->seg.tso_frags[num_frags].paddr = 0;
num_frags--;
}
@ -2094,7 +2096,7 @@ void __qdf_nbuf_unmap_tso_segment(qdf_device_t osdev,
dma_unmap_single(osdev->dev,
tso_seg->seg.tso_frags[0].paddr,
tso_seg->seg.tso_frags[0].length,
QDF_DMA_TO_DEVICE);
__qdf_dma_dir_to_os(QDF_DMA_TO_DEVICE));
tso_seg->seg.tso_frags[0].paddr = 0;
}
}
@ -2297,7 +2299,7 @@ QDF_STATUS __qdf_nbuf_map_nbytes_single(
/* assume that the OS only provides a single fragment */
QDF_NBUF_CB_PADDR(buf) = paddr =
dma_map_single(osdev->dev, buf->data,
nbytes, dir);
nbytes, __qdf_dma_dir_to_os(dir));
return dma_mapping_error(osdev->dev, paddr) ?
QDF_STATUS_E_FAULT : QDF_STATUS_SUCCESS;
}
@ -2330,7 +2332,7 @@ __qdf_nbuf_unmap_nbytes_single(
return;
}
dma_unmap_single(osdev->dev, QDF_NBUF_CB_PADDR(buf),
nbytes, dir);
nbytes, __qdf_dma_dir_to_os(dir));
}
EXPORT_SYMBOL(__qdf_nbuf_unmap_nbytes_single);
#endif
@ -2530,7 +2532,8 @@ QDF_STATUS __qdf_nbuf_frag_map(
frag_len = skb_frag_size(frag);
QDF_NBUF_CB_TX_EXTRA_FRAG_PADDR(nbuf) = paddr =
skb_frag_dma_map(osdev->dev, frag, offset, frag_len, dir);
skb_frag_dma_map(osdev->dev, frag, offset, frag_len,
__qdf_dma_dir_to_os(dir));
return dma_mapping_error(osdev->dev, paddr) ?
QDF_STATUS_E_FAULT : QDF_STATUS_SUCCESS;
}
@ -2575,7 +2578,8 @@ static void __qdf_nbuf_sync_single_for_cpu(
return;
}
dma_sync_single_for_cpu(osdev->dev, QDF_NBUF_CB_PADDR(buf),
skb_end_offset(buf) - skb_headroom(buf), dir);
skb_end_offset(buf) - skb_headroom(buf),
__qdf_dma_dir_to_os(dir));
}
#endif
/**