diff options
| author | Nathan Chancellor <natechancellor@gmail.com> | 2018-05-19 20:32:56 -0700 |
|---|---|---|
| committer | Davide Garberi <dade.garberi@gmail.com> | 2021-10-07 20:10:10 +0200 |
| commit | 86d315666abd3b120786c4de1632b2f3adb1b8e8 (patch) | |
| tree | 7369f1b1e18c8ebd1c13b8230188f2488d66221e | |
| parent | 482395a5034719b3f3271d097f96f5ef5595e016 (diff) | |
staging: ion: Fix enum conversion warnings
Clang complains about converting between ion_heap_type and
msm_ion_heap_type. They ultimately don't conflict with each
other as msm_ion_heap_type supplements ion_heap_type but Clang
can't see that. Just change type into a int.
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
| -rw-r--r-- | drivers/staging/android/ion/ion.c | 2 | ||||
| -rw-r--r-- | drivers/staging/android/ion/ion_priv.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index 9a0b73bc1379..86fd946d3feb 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -2104,7 +2104,7 @@ void ion_device_add_heap(struct ion_device *dev, struct ion_heap *heap) EXPORT_SYMBOL(ion_device_add_heap); int ion_walk_heaps(struct ion_client *client, int heap_id, - enum ion_heap_type type, void *data, + unsigned int type, void *data, int (*f)(struct ion_heap *heap, void *data)) { int ret_val = 0; diff --git a/drivers/staging/android/ion/ion_priv.h b/drivers/staging/android/ion/ion_priv.h index 77bd0f8e4643..f357d80c1d54 100644 --- a/drivers/staging/android/ion/ion_priv.h +++ b/drivers/staging/android/ion/ion_priv.h @@ -186,7 +186,7 @@ struct ion_heap_ops { struct ion_heap { struct plist_node node; struct ion_device *dev; - enum ion_heap_type type; + unsigned int type; struct ion_heap_ops *ops; unsigned long flags; unsigned int id; @@ -502,7 +502,7 @@ void ion_pages_sync_for_device(struct device *dev, struct page *page, size_t size, enum dma_data_direction dir); int ion_walk_heaps(struct ion_client *client, int heap_id, - enum ion_heap_type type, void *data, + unsigned int type, void *data, int (*f)(struct ion_heap *heap, void *data)); struct ion_handle *ion_handle_get_by_id_nolock(struct ion_client *client, |