diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-04-13 11:23:18 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-04-13 11:23:18 +0300 |
| commit | 9a4f35865ffcb2f4603375eadabe0d475fab1a0f (patch) | |
| tree | 1465ac717deee029d3a9c1f7235ba85be57feefa /sound/soc/intel/sst/sst_loader.c | |
| parent | eef0342cf32689f77d78ee3302999e5caaa6a8f3 (diff) | |
| parent | c30cf8cbe55413cd643a0bdd3442d75950caa918 (diff) | |
| download | linux-9a4f35865ffcb2f4603375eadabe0d475fab1a0f.tar.xz | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/soc/intel/sst/sst_loader.c')
| -rw-r--r-- | sound/soc/intel/sst/sst_loader.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sound/soc/intel/sst/sst_loader.c b/sound/soc/intel/sst/sst_loader.c index 7888cd707853..e88907ae8b15 100644 --- a/sound/soc/intel/sst/sst_loader.c +++ b/sound/soc/intel/sst/sst_loader.c @@ -39,7 +39,15 @@ #include "sst.h" #include "../sst-dsp.h" -static inline void memcpy32_toio(void __iomem *dst, const void *src, int count) +void memcpy32_toio(void __iomem *dst, const void *src, int count) +{ + /* __iowrite32_copy uses 32-bit count values so divide by 4 for + * right count in words + */ + __iowrite32_copy(dst, src, count/4); +} + +void memcpy32_fromio(void *dst, const void __iomem *src, int count) { /* __iowrite32_copy uses 32-bit count values so divide by 4 for * right count in words |