Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit ce1cfe29 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: Atom: simplify iomem address and casts 



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

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ef3cb742

sound/soc/intel/atom/sst/sst_drv_interface.c

+15 −14
Original line number Diff line number Diff line
@@ -266,17 +266,15 @@ static int sst_cdev_ack(struct device *dev, unsigned int str_id, 
	stream->cumm_bytes += bytes;

	dev_dbg(dev, "bytes copied %d inc by %ld\n", stream->cumm_bytes, bytes);



	memcpy_fromio(&fw_tstamp,

		((void *)(ctx->mailbox + ctx->tstamp)

		+(str_id * sizeof(fw_tstamp))),

		sizeof(fw_tstamp));

	addr =  ((void __iomem *)(ctx->mailbox + ctx->tstamp)) +

		(str_id * sizeof(fw_tstamp));



	memcpy_fromio(&fw_tstamp, addr, sizeof(fw_tstamp));



	fw_tstamp.bytes_copied = stream->cumm_bytes;

	dev_dbg(dev, "bytes sent to fw %llu inc by %ld\n",

			fw_tstamp.bytes_copied, bytes);



	addr =  ((void *)(ctx->mailbox + ctx->tstamp)) +

			(str_id * sizeof(fw_tstamp));

	offset =  offsetof(struct snd_sst_tstamp, bytes_copied);

	sst_shim_write(addr, offset, fw_tstamp.bytes_copied);

	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 stream_info *stream;

	struct intel_sst_drv *ctx = dev_get_drvdata(dev);

	void __iomem *addr;



	addr = (void __iomem *)(ctx->mailbox + ctx->tstamp) +

		(str_id * sizeof(fw_tstamp));



	memcpy_fromio(&fw_tstamp,

		((void *)(ctx->mailbox + ctx->tstamp)

		+(str_id * sizeof(fw_tstamp))),

		sizeof(fw_tstamp));

	memcpy_fromio(&fw_tstamp, addr, sizeof(fw_tstamp));



	stream = get_stream_info(ctx, str_id);

	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;

	unsigned int str_id;

	struct intel_sst_drv *ctx = dev_get_drvdata(dev);

	void __iomem *addr;



	str_id = info->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;

	substream = stream->pcm_substream;



	memcpy_fromio(&fw_tstamp,

		((void *)(ctx->mailbox + ctx->tstamp)

			+ (str_id * sizeof(fw_tstamp))),

		sizeof(fw_tstamp));

	addr = (void __iomem *)(ctx->mailbox + ctx->tstamp) +

		(str_id * sizeof(fw_tstamp));



	memcpy_fromio(&fw_tstamp, addr, sizeof(fw_tstamp));



	return sst_calc_tstamp(ctx, info, substream, &fw_tstamp);

}