From 2190ece2f516deeb72d2fc87903216802ae4507e Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Thu, 7 May 2020 23:32:39 +0800 Subject: [PATCH] ANDROID: GKI: fix build warning on 32bits due to ASoC msm change Commit dbad92f6e8b6 ("ANDROID: GKI: ASoC: msm: fix integer overflow for long duration offload playback") causes a build warning if the kernel is built for a 32bit target, like i386. The warning is: CC [M] sound/soc/intel/atom/sst/sst_drv_interface.o In file included from kernel/include/linux/printk.h:337:0, from kernel/include/linux/kernel.h:13, from kernel/include/linux/delay.h:22, from kernel/sound/soc/intel/atom/sst/sst_drv_interface.c:21: kernel/sound/soc/intel/atom/sst/sst_drv_interface.c: In function 'sst_cdev_tstamp': kernel/include/linux/dynamic_debug.h:75:16: warning: format '%d' expects argument of type 'int', but argument 5 has type '__u64' [-Wformat=] static struct _ddebug __aligned(8) \ ^ kernel/include/linux/dynamic_debug.h:111:2: note: in expansion of macro 'DEFINE_DYNAMIC_DEBUG_METADATA_KEY' DEFINE_DYNAMIC_DEBUG_METADATA_KEY(name, fmt, 0, 0) ^ kernel/include/linux/dynamic_debug.h:133:2: note: in expansion of macro 'DEFINE_DYNAMIC_DEBUG_METADATA' DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt); \ ^ kernel/include/linux/device.h:1544:2: note: in expansion of macro 'dynamic_dev_dbg' dynamic_dev_dbg(dev, dev_fmt(fmt), ##__VA_ARGS__) ^ kernel/sound/soc/intel/atom/sst/sst_drv_interface.c:380:2: note: in expansion of macro 'dev_dbg' dev_dbg(dev, "Ptr Query on strid = %d copied_total %d, decodec %d\n", ^ Bug: 153747771 Cc: Dhananjay Kumar Cc: Banajit Goswami Cc: Meng Wang Cc: Will McVicker Fixes: dbad92f6e8b6 ("ANDROID: GKI: ASoC: msm: fix integer overflow for long duration offload playback") Signed-off-by: Chih-Wei Huang Signed-off-by: Greg Kroah-Hartman Change-Id: I0d012271c90bd56764558467b5c53a6d49570604 --- sound/soc/intel/atom/sst/sst_drv_interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/atom/sst/sst_drv_interface.c b/sound/soc/intel/atom/sst/sst_drv_interface.c index 5455d6e0ab53..dc1160f79dc2 100644 --- a/sound/soc/intel/atom/sst/sst_drv_interface.c +++ b/sound/soc/intel/atom/sst/sst_drv_interface.c @@ -377,7 +377,7 @@ static int sst_cdev_tstamp(struct device *dev, unsigned int str_id, tstamp->sampling_rate = fw_tstamp.sampling_frequency; dev_dbg(dev, "PCM = %u\n", tstamp->pcm_io_frames); - dev_dbg(dev, "Ptr Query on strid = %d copied_total %d, decodec %d\n", + dev_dbg(dev, "Ptr Query on strid = %d copied_total %llu, decodec %d\n", str_id, tstamp->copied_total, tstamp->pcm_frames); dev_dbg(dev, "rendered %d\n", tstamp->pcm_io_frames);