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

Commit 8bce6121 authored by Bob Copeland's avatar Bob Copeland Committed by John W. Linville
Browse files

wl12xx: correct printk format warnings 



Fixes warnings:
  drivers/net/wireless/wl12xx/main.c:87: warning: int format, different
    type arg (arg 2)
  drivers/net/wireless/wl12xx/main.c: In function `wl12xx_fetch_nvs':
  drivers/net/wireless/wl12xx/main.c:125: warning: int format, different
    type arg (arg 2)
  drivers/net/wireless/wl12xx/wl1251.c: In function 'wl1251_upload_firmware':
  drivers/net/wireless/wl12xx/wl1251.c:94: warning: int format, different
    type arg (arg 2)
  drivers/net/wireless/wl12xx/wl1251.c:141: warning: int format, different
    type arg (arg 2)

Signed-off-by: default avatarBob Copeland <me@bobcopeland.com>
Acked-by: default avatarKalle Valo <kalle.valo@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4e8e2c82

drivers/net/wireless/wl12xx/main.c

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static int wl12xx_fetch_firmware(struct wl12xx *wl) 
	}



	if (fw->size % 4) {

		wl12xx_error("firmware size is not multiple of 32 bits: %d",

		wl12xx_error("firmware size is not multiple of 32 bits: %zu",

			     fw->size);

		ret = -EILSEQ;

		goto out;
@@ -122,7 +122,7 @@ static int wl12xx_fetch_nvs(struct wl12xx *wl) 
	}



	if (fw->size % 4) {

		wl12xx_error("nvs size is not multiple of 32 bits: %d",

		wl12xx_error("nvs size is not multiple of 32 bits: %zu",

			     fw->size);

		ret = -EILSEQ;

		goto out;

drivers/net/wireless/wl12xx/wl1251.c

+2 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static int wl1251_upload_firmware(struct wl12xx *wl) 
	fw_data_len =  (wl->fw[4] << 24) | (wl->fw[5] << 16) |

		(wl->fw[6] << 8) | (wl->fw[7]);



	wl12xx_debug(DEBUG_BOOT, "fw_data_len %d chunk_size %d", fw_data_len,

	wl12xx_debug(DEBUG_BOOT, "fw_data_len %zu chunk_size %d", fw_data_len,

		CHUNK_SIZE);



	if ((fw_data_len % 4) != 0) {
@@ -138,7 +138,7 @@ static int wl1251_upload_firmware(struct wl12xx *wl) 
	/* 10.4 upload the last chunk */

	addr = p_table[PART_DOWN].mem.start + chunk_num * CHUNK_SIZE;

	p = wl->fw + FW_HDR_SIZE + chunk_num * CHUNK_SIZE;

	wl12xx_debug(DEBUG_BOOT, "uploading fw last chunk (%d B) 0x%p to 0x%x",

	wl12xx_debug(DEBUG_BOOT, "uploading fw last chunk (%zu B) 0x%p to 0x%x",

		     fw_data_len % CHUNK_SIZE, p, addr);

	wl12xx_spi_mem_write(wl, addr, p, fw_data_len % CHUNK_SIZE);