leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: Intel: Atom: simplify iomem address and casts

Browse Source 
Simplify code and add relevant casts to make Sparse warnings go away

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Pierre-Louis Bossart 2018-07-24 16:12:47 -05:00 committed by Mark Brown
parent ef3cb74233
commit ce1cfe295a
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sound/soc/intel/atom/sst/sst_drv_interface.c
View File

@ -266,17 +266,15 @@ static int sst_cdev_ack(struct device *dev, unsigned int str_id,
stream->cumm_bytes += bytes; stream->cumm_bytes += bytes;
dev_dbg(dev, "bytes copied %d inc by %ld\n", stream->cumm_bytes, bytes); dev_dbg(dev, "bytes copied %d inc by %ld\n", stream->cumm_bytes, bytes);
memcpy_fromio(&fw_tstamp, addr = ((void __iomem *)(ctx->mailbox + ctx->tstamp)) +
((void *)(ctx->mailbox + ctx->tstamp) (str_id * sizeof(fw_tstamp));
+(str_id * sizeof(fw_tstamp))),
sizeof(fw_tstamp)); memcpy_fromio(&fw_tstamp, addr, sizeof(fw_tstamp));
fw_tstamp.bytes_copied = stream->cumm_bytes; fw_tstamp.bytes_copied = stream->cumm_bytes;
dev_dbg(dev, "bytes sent to fw %llu inc by %ld\n", dev_dbg(dev, "bytes sent to fw %llu inc by %ld\n",
fw_tstamp.bytes_copied, bytes); fw_tstamp.bytes_copied, bytes);
addr = ((void *)(ctx->mailbox + ctx->tstamp)) +
(str_id * sizeof(fw_tstamp));
offset = offsetof(struct snd_sst_tstamp, bytes_copied); offset = offsetof(struct snd_sst_tstamp, bytes_copied);
sst_shim_write(addr, offset, fw_tstamp.bytes_copied); sst_shim_write(addr, offset, fw_tstamp.bytes_copied);
return 0; return 0;
@ -360,11 +358,12 @@ static int sst_cdev_tstamp(struct device *dev, unsigned int str_id,
struct snd_sst_tstamp fw_tstamp = {0,}; struct snd_sst_tstamp fw_tstamp = {0,};
struct stream_info *stream; struct stream_info *stream;
struct intel_sst_drv *ctx = dev_get_drvdata(dev); struct intel_sst_drv *ctx = dev_get_drvdata(dev);
void __iomem *addr;
memcpy_fromio(&fw_tstamp, addr = (void __iomem *)(ctx->mailbox + ctx->tstamp) +
((void *)(ctx->mailbox + ctx->tstamp) (str_id * sizeof(fw_tstamp));
+(str_id * sizeof(fw_tstamp))),
sizeof(fw_tstamp)); memcpy_fromio(&fw_tstamp, addr, sizeof(fw_tstamp));
stream = get_stream_info(ctx, str_id); stream = get_stream_info(ctx, str_id);
if (!stream) if (!stream)
@ -530,6 +529,7 @@ static int sst_read_timestamp(struct device *dev, struct pcm_stream_info *info)
struct snd_sst_tstamp fw_tstamp; struct snd_sst_tstamp fw_tstamp;
unsigned int str_id; unsigned int str_id;
struct intel_sst_drv *ctx = dev_get_drvdata(dev); struct intel_sst_drv *ctx = dev_get_drvdata(dev);
void __iomem *addr;
str_id = info->str_id; str_id = info->str_id;
stream = get_stream_info(ctx, str_id); stream = get_stream_info(ctx, str_id);
@ -540,10 +540,11 @@ static int sst_read_timestamp(struct device *dev, struct pcm_stream_info *info)
return -EINVAL; return -EINVAL;
substream = stream->pcm_substream; substream = stream->pcm_substream;
memcpy_fromio(&fw_tstamp, addr = (void __iomem *)(ctx->mailbox + ctx->tstamp) +
((void *)(ctx->mailbox + ctx->tstamp) (str_id * sizeof(fw_tstamp));
+ (str_id * sizeof(fw_tstamp))),
sizeof(fw_tstamp)); memcpy_fromio(&fw_tstamp, addr, sizeof(fw_tstamp));
return sst_calc_tstamp(ctx, info, substream, &fw_tstamp); return sst_calc_tstamp(ctx, info, substream, &fw_tstamp);
} }