projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'dt-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[linux-2.6-microblaze.git]
/
drivers
/
bus
/
mhi
/
core
/
boot.c
diff --git
a/drivers/bus/mhi/core/boot.c
b/drivers/bus/mhi/core/boot.c
index
8100cf5
..
0a97262
100644
(file)
--- a/
drivers/bus/mhi/core/boot.c
+++ b/
drivers/bus/mhi/core/boot.c
@@
-302,8
+302,8
@@
void mhi_free_bhie_table(struct mhi_controller *mhi_cntrl,
struct mhi_buf *mhi_buf = image_info->mhi_buf;
for (i = 0; i < image_info->entries; i++, mhi_buf++)
struct mhi_buf *mhi_buf = image_info->mhi_buf;
for (i = 0; i < image_info->entries; i++, mhi_buf++)
-
mhi_free_coherent(mhi_cntrl, mhi_buf->len, mhi_buf->buf
,
- mhi_buf->dma_addr);
+
dma_free_coherent(mhi_cntrl->cntrl_dev, mhi_buf->len
,
+ mhi_buf->
buf, mhi_buf->
dma_addr);
kfree(image_info->mhi_buf);
kfree(image_info);
kfree(image_info->mhi_buf);
kfree(image_info);
@@
-339,8
+339,8
@@
int mhi_alloc_bhie_table(struct mhi_controller *mhi_cntrl,
vec_size = sizeof(struct bhi_vec_entry) * i;
mhi_buf->len = vec_size;
vec_size = sizeof(struct bhi_vec_entry) * i;
mhi_buf->len = vec_size;
- mhi_buf->buf =
mhi_alloc_coherent(mhi_cntrl, vec_size
,
- &mhi_buf->dma_addr,
+ mhi_buf->buf =
dma_alloc_coherent(mhi_cntrl->cntrl_dev
,
+
vec_size,
&mhi_buf->dma_addr,
GFP_KERNEL);
if (!mhi_buf->buf)
goto error_alloc_segment;
GFP_KERNEL);
if (!mhi_buf->buf)
goto error_alloc_segment;
@@
-354,8
+354,8
@@
int mhi_alloc_bhie_table(struct mhi_controller *mhi_cntrl,
error_alloc_segment:
for (--i, --mhi_buf; i >= 0; i--, mhi_buf--)
error_alloc_segment:
for (--i, --mhi_buf; i >= 0; i--, mhi_buf--)
-
mhi_free_coherent(mhi_cntrl, mhi_buf->len, mhi_buf->buf
,
- mhi_buf->dma_addr);
+
dma_free_coherent(mhi_cntrl->cntrl_dev, mhi_buf->len
,
+ mhi_buf->
buf, mhi_buf->
dma_addr);
error_alloc_mhi_buf:
kfree(img_info);
error_alloc_mhi_buf:
kfree(img_info);
@@
-442,7
+442,8
@@
void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)
if (size > firmware->size)
size = firmware->size;
if (size > firmware->size)
size = firmware->size;
- buf = mhi_alloc_coherent(mhi_cntrl, size, &dma_addr, GFP_KERNEL);
+ buf = dma_alloc_coherent(mhi_cntrl->cntrl_dev, size, &dma_addr,
+ GFP_KERNEL);
if (!buf) {
release_firmware(firmware);
goto error_fw_load;
if (!buf) {
release_firmware(firmware);
goto error_fw_load;
@@
-451,7
+452,7
@@
void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)
/* Download image using BHI */
memcpy(buf, firmware->data, size);
ret = mhi_fw_load_bhi(mhi_cntrl, dma_addr, size);
/* Download image using BHI */
memcpy(buf, firmware->data, size);
ret = mhi_fw_load_bhi(mhi_cntrl, dma_addr, size);
-
mhi_free_coherent(mhi_cntrl
, size, buf, dma_addr);
+
dma_free_coherent(mhi_cntrl->cntrl_dev
, size, buf, dma_addr);
/* Error or in EDL mode, we're done */
if (ret) {
/* Error or in EDL mode, we're done */
if (ret) {