Skip to content

Commit

Permalink
Merge pull request torvalds#44 from bas-t/fixes
Browse files Browse the repository at this point in the history 
Fixes format strings.
  • Loading branch information
@ljalves
ljalves committed Nov 10, 2014
2 parents 607c9aa + d9f9147 commit 0058fe3
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions drivers/media/pci/saa716x/saa716x_rom.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ static int saa716x_eeprom_header(struct saa716x_dev *saa716x,
memcpy(rom_header, &buf[*offset], sizeof (struct saa716x_romhdr));
if (rom_header->header_size != sizeof (struct saa716x_romhdr)) {
dprintk(SAA716x_ERROR, 1,
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
"ERROR: Header size mismatch! Read size=%zd bytes, Expected=%d",
sizeof (struct saa716x_romhdr),
rom_header->header_size);

Expand Down Expand Up @@ -237,7 +237,7 @@ static int saa716x_decoder_info(struct saa716x_dev *saa716x,
saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
if (header.size != sizeof (struct saa716x_decoder_hdr)) {
dprintk(SAA716x_ERROR, 1,
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
header.size,
sizeof (struct saa716x_decoder_hdr));

Expand Down Expand Up @@ -268,7 +268,7 @@ static int saa716x_gpio_info(struct saa716x_dev *saa716x,
saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
if (header.size != sizeof (struct saa716x_gpio_hdr)) {
dprintk(SAA716x_ERROR, 1,
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
header.size,
sizeof (struct saa716x_gpio_hdr));

Expand Down Expand Up @@ -305,7 +305,7 @@ static int saa716x_video_decoder_info(struct saa716x_dev *saa716x,
saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
if (header.size != sizeof (struct saa716x_video_decoder_hdr)) {
dprintk(SAA716x_ERROR, 1,
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
header.size,
sizeof (struct saa716x_video_decoder_hdr));

Expand Down Expand Up @@ -386,7 +386,7 @@ static int saa716x_audio_decoder_info(struct saa716x_dev *saa716x,
saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
if (header.size != sizeof (struct saa716x_audio_decoder_hdr)) {
dprintk(SAA716x_ERROR, 1,
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
header.size,
sizeof (struct saa716x_audio_decoder_hdr));

Expand Down Expand Up @@ -417,7 +417,7 @@ static int saa716x_event_source_info(struct saa716x_dev *saa716x,
saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
if (header.size != sizeof (struct saa716x_evsrc_hdr)) {
dprintk(SAA716x_ERROR, 1,
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
header.size,
sizeof (struct saa716x_evsrc_hdr));

Expand Down Expand Up @@ -448,7 +448,7 @@ static int saa716x_crossbar_info(struct saa716x_dev *saa716x,
saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
if (header.size != sizeof (struct saa716x_xbar_hdr)) {
dprintk(SAA716x_ERROR, 1,
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
header.size,
sizeof (struct saa716x_xbar_hdr));

Expand Down Expand Up @@ -486,7 +486,7 @@ static int saa716x_tuner_info(struct saa716x_dev *saa716x,
saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
if (header.size != sizeof (struct saa716x_tuner_hdr)) {
dprintk(SAA716x_ERROR, 1,
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
header.size,
sizeof (struct saa716x_tuner_hdr));

Expand Down Expand Up @@ -516,7 +516,7 @@ static int saa716x_pll_info(struct saa716x_dev *saa716x,
saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
if (header.size != sizeof (struct saa716x_pll_hdr)) {
dprintk(SAA716x_ERROR, 1,
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
header.size,
sizeof (struct saa716x_pll_hdr));

Expand Down Expand Up @@ -546,7 +546,7 @@ static int saa716x_channel_decoder_info(struct saa716x_dev *saa716x,
saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
if (header.size != sizeof (struct saa716x_channel_decoder_hdr)) {
dprintk(SAA716x_ERROR, 1,
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
header.size,
sizeof (struct saa716x_channel_decoder_hdr));

Expand Down Expand Up @@ -576,7 +576,7 @@ static int saa716x_encoder_info(struct saa716x_dev *saa716x,
saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
if (header.size != sizeof (struct saa716x_encoder_hdr)) {
dprintk(SAA716x_ERROR, 1,
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
header.size,
sizeof (struct saa716x_encoder_hdr));

Expand Down Expand Up @@ -606,7 +606,7 @@ static int saa716x_ir_info(struct saa716x_dev *saa716x,
saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
if (header.size != sizeof (struct saa716x_ir_hdr)) {
dprintk(SAA716x_ERROR, 1,
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
header.size,
sizeof (struct saa716x_ir_hdr));

Expand Down Expand Up @@ -637,7 +637,7 @@ static int saa716x_eeprom_info(struct saa716x_dev *saa716x,
saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
if (header.size != sizeof (struct saa716x_eeprom_hdr)) {
dprintk(SAA716x_ERROR, 1,
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
header.size,
sizeof (struct saa716x_eeprom_hdr));

Expand Down Expand Up @@ -668,7 +668,7 @@ static int saa716x_filter_info(struct saa716x_dev *saa716x,
saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
if (header.size != sizeof (struct saa716x_filter_hdr)) {
dprintk(SAA716x_ERROR, 1,
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
header.size,
sizeof (struct saa716x_filter_hdr));

Expand Down Expand Up @@ -699,7 +699,7 @@ static int saa716x_streamdev_info(struct saa716x_dev *saa716x,
saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data);
if (header.size != sizeof (struct saa716x_streamdev_hdr)) {
dprintk(SAA716x_ERROR, 1,
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%d",
"ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd",
header.size,
sizeof (struct saa716x_streamdev_hdr));

Expand Down Expand Up @@ -789,7 +789,7 @@ static int saa716x_device_info(struct saa716x_dev *saa716x,

memcpy(device, &buf[*offset], sizeof (struct saa716x_devinfo));
if (device->struct_size != sizeof (struct saa716x_devinfo)) {
dprintk(SAA716x_ERROR, 1, "ERROR: Device size mismatch! Read=%d bytes, expected=%d bytes",
dprintk(SAA716x_ERROR, 1, "ERROR: Device size mismatch! Read=%d bytes, expected=%zd bytes",
device->struct_size,
sizeof (struct saa716x_devinfo));

Expand Down

0 comments on commit 0058fe3

Please sign in to comment.