aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-09-24 19:35:48 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-09-26 05:51:00 -0400
commit339f06c5d354c4c89814f11d0c3393f198b3dd00 (patch)
treee27fb1f85facd6ec8ffd304680ec71b62b683558 /drivers/media
parent35f30f36a7e66caa0973a4db620b4245df2cf428 (diff)
[media] pci drivers: use %zu instead of %zd
size_t is unsigned. Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/pci/cx18/cx18-alsa-pcm.c2
-rw-r--r--drivers/media/pci/cx18/cx18-firmware.c4
-rw-r--r--drivers/media/pci/cx18/cx18-queue.c2
-rw-r--r--drivers/media/pci/cx23885/cx23885-417.c2
-rw-r--r--drivers/media/pci/ivtv/ivtv-alsa-pcm.c2
-rw-r--r--drivers/media/pci/ivtv/ivtv-firmware.c4
6 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/pci/cx18/cx18-alsa-pcm.c b/drivers/media/pci/cx18/cx18-alsa-pcm.c
index 180077c49123..ffb6acdc575f 100644
--- a/drivers/media/pci/cx18/cx18-alsa-pcm.c
+++ b/drivers/media/pci/cx18/cx18-alsa-pcm.c
@@ -80,7 +80,7 @@ void cx18_alsa_announce_pcm_data(struct snd_cx18_card *cxsc, u8 *pcm_data,
80 int period_elapsed = 0; 80 int period_elapsed = 0;
81 int length; 81 int length;
82 82
83 dprintk("cx18 alsa announce ptr=%p data=%p num_bytes=%zd\n", cxsc, 83 dprintk("cx18 alsa announce ptr=%p data=%p num_bytes=%zu\n", cxsc,
84 pcm_data, num_bytes); 84 pcm_data, num_bytes);
85 85
86 substream = cxsc->capture_pcm_substream; 86 substream = cxsc->capture_pcm_substream;
diff --git a/drivers/media/pci/cx18/cx18-firmware.c b/drivers/media/pci/cx18/cx18-firmware.c
index 53a7578d525b..c6c83445f8bf 100644
--- a/drivers/media/pci/cx18/cx18-firmware.c
+++ b/drivers/media/pci/cx18/cx18-firmware.c
@@ -130,7 +130,7 @@ static int load_cpu_fw_direct(const char *fn, u8 __iomem *mem, struct cx18 *cx)
130 } 130 }
131 } 131 }
132 if (!test_bit(CX18_F_I_LOADED_FW, &cx->i_flags)) 132 if (!test_bit(CX18_F_I_LOADED_FW, &cx->i_flags))
133 CX18_INFO("loaded %s firmware (%zd bytes)\n", fn, fw->size); 133 CX18_INFO("loaded %s firmware (%zu bytes)\n", fn, fw->size);
134 size = fw->size; 134 size = fw->size;
135 release_firmware(fw); 135 release_firmware(fw);
136 cx18_setup_page(cx, SCB_OFFSET); 136 cx18_setup_page(cx, SCB_OFFSET);
@@ -202,7 +202,7 @@ static int load_apu_fw_direct(const char *fn, u8 __iomem *dst, struct cx18 *cx,
202 offset += seghdr.size; 202 offset += seghdr.size;
203 } 203 }
204 if (!test_bit(CX18_F_I_LOADED_FW, &cx->i_flags)) 204 if (!test_bit(CX18_F_I_LOADED_FW, &cx->i_flags))
205 CX18_INFO("loaded %s firmware V%08x (%zd bytes)\n", 205 CX18_INFO("loaded %s firmware V%08x (%zu bytes)\n",
206 fn, apu_version, fw->size); 206 fn, apu_version, fw->size);
207 size = fw->size; 207 size = fw->size;
208 release_firmware(fw); 208 release_firmware(fw);
diff --git a/drivers/media/pci/cx18/cx18-queue.c b/drivers/media/pci/cx18/cx18-queue.c
index 8884537bd62f..2a247d264b87 100644
--- a/drivers/media/pci/cx18/cx18-queue.c
+++ b/drivers/media/pci/cx18/cx18-queue.c
@@ -364,7 +364,7 @@ int cx18_stream_alloc(struct cx18_stream *s)
364 ((char __iomem *)cx->scb->cpu_mdl)); 364 ((char __iomem *)cx->scb->cpu_mdl));
365 365
366 CX18_ERR("Too many buffers, cannot fit in SCB area\n"); 366 CX18_ERR("Too many buffers, cannot fit in SCB area\n");
367 CX18_ERR("Max buffers = %zd\n", 367 CX18_ERR("Max buffers = %zu\n",
368 bufsz / sizeof(struct cx18_mdl_ent)); 368 bufsz / sizeof(struct cx18_mdl_ent));
369 return -ENOMEM; 369 return -ENOMEM;
370 } 370 }
diff --git a/drivers/media/pci/cx23885/cx23885-417.c b/drivers/media/pci/cx23885/cx23885-417.c
index 6973055f0814..3948db386fb5 100644
--- a/drivers/media/pci/cx23885/cx23885-417.c
+++ b/drivers/media/pci/cx23885/cx23885-417.c
@@ -942,7 +942,7 @@ static int cx23885_load_firmware(struct cx23885_dev *dev)
942 942
943 if (firmware->size != CX23885_FIRM_IMAGE_SIZE) { 943 if (firmware->size != CX23885_FIRM_IMAGE_SIZE) {
944 printk(KERN_ERR "ERROR: Firmware size mismatch " 944 printk(KERN_ERR "ERROR: Firmware size mismatch "
945 "(have %zd, expected %d)\n", 945 "(have %zu, expected %d)\n",
946 firmware->size, CX23885_FIRM_IMAGE_SIZE); 946 firmware->size, CX23885_FIRM_IMAGE_SIZE);
947 release_firmware(firmware); 947 release_firmware(firmware);
948 return -1; 948 return -1;
diff --git a/drivers/media/pci/ivtv/ivtv-alsa-pcm.c b/drivers/media/pci/ivtv/ivtv-alsa-pcm.c
index 7a9b98bc208b..7bf9cbca4fa6 100644
--- a/drivers/media/pci/ivtv/ivtv-alsa-pcm.c
+++ b/drivers/media/pci/ivtv/ivtv-alsa-pcm.c
@@ -81,7 +81,7 @@ static void ivtv_alsa_announce_pcm_data(struct snd_ivtv_card *itvsc,
81 int period_elapsed = 0; 81 int period_elapsed = 0;
82 int length; 82 int length;
83 83
84 dprintk("ivtv alsa announce ptr=%p data=%p num_bytes=%zd\n", itvsc, 84 dprintk("ivtv alsa announce ptr=%p data=%p num_bytes=%zu\n", itvsc,
85 pcm_data, num_bytes); 85 pcm_data, num_bytes);
86 86
87 substream = itvsc->capture_pcm_substream; 87 substream = itvsc->capture_pcm_substream;
diff --git a/drivers/media/pci/ivtv/ivtv-firmware.c b/drivers/media/pci/ivtv/ivtv-firmware.c
index ed73edd2bcd3..4b0e758a7bce 100644
--- a/drivers/media/pci/ivtv/ivtv-firmware.c
+++ b/drivers/media/pci/ivtv/ivtv-firmware.c
@@ -65,7 +65,7 @@ retry:
65 the wrong file was sometimes loaded. So we check filesizes to 65 the wrong file was sometimes loaded. So we check filesizes to
66 see if at least the right-sized file was loaded. If not, then we 66 see if at least the right-sized file was loaded. If not, then we
67 retry. */ 67 retry. */
68 IVTV_INFO("Retry: file loaded was not %s (expected size %ld, got %zd)\n", fn, size, fw->size); 68 IVTV_INFO("Retry: file loaded was not %s (expected size %ld, got %zu)\n", fn, size, fw->size);
69 release_firmware(fw); 69 release_firmware(fw);
70 retries--; 70 retries--;
71 goto retry; 71 goto retry;
@@ -76,7 +76,7 @@ retry:
76 dst++; 76 dst++;
77 src++; 77 src++;
78 } 78 }
79 IVTV_INFO("Loaded %s firmware (%zd bytes)\n", fn, fw->size); 79 IVTV_INFO("Loaded %s firmware (%zu bytes)\n", fn, fw->size);
80 release_firmware(fw); 80 release_firmware(fw);
81 return size; 81 return size;
82 } 82 }