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

Commit 2a304bb8 authored by Randy Dunlap's avatar Randy Dunlap Committed by David S. Miller
Browse files

wimax: fix printk format warnings 



Fix printk format warnings in drivers/net/wimax/i2400m:

drivers/net/wimax/i2400m/control.c: warning: format '%zu' expects argument of type 'size_t', but argument 4 has type 'ssize_t' [-Wformat]
drivers/net/wimax/i2400m/control.c: warning: format '%zu' expects argument of type 'size_t', but argument 5 has type 'ssize_t' [-Wformat]
drivers/net/wimax/i2400m/usb-fw.c: warning: format '%zu' expects argument of type 'size_t', but argument 4 has type 'ssize_t' [-Wformat]

I don't see these warnings on x86.  The warnings that are quoted above
are from Geert's kernel build reports.

Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Cc:	Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
Cc:	linux-wimax@intel.com
Cc:	wimax@linuxwimax.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5aa93bcf

drivers/net/wimax/i2400m/control.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -130,7 +130,7 @@ ssize_t i2400m_tlv_match(const struct i2400m_tlv_hdr *tlv, 
	    && le16_to_cpu(tlv->length) + sizeof(*tlv) != tlv_size) {

	    && le16_to_cpu(tlv->length) + sizeof(*tlv) != tlv_size) {

		size_t size = le16_to_cpu(tlv->length) + sizeof(*tlv);

		size_t size = le16_to_cpu(tlv->length) + sizeof(*tlv);

		printk(KERN_WARNING "W: tlv type 0x%x mismatched because of "

		printk(KERN_WARNING "W: tlv type 0x%x mismatched because of "

		       "size (got %zu vs %zu expected)\n",

		       "size (got %zu vs %zd expected)\n",

		       tlv_type, size, tlv_size);

		       tlv_type, size, tlv_size);

		return size;

		return size;

	}

	}
@@ -235,7 +235,7 @@ const struct i2400m_tlv_hdr *i2400m_tlv_find( 
			break;

			break;

		if (match > 0)

		if (match > 0)

			dev_warn(dev, "TLV type 0x%04x found with size "

			dev_warn(dev, "TLV type 0x%04x found with size "

				 "mismatch (%zu vs %zu needed)\n",

				 "mismatch (%zu vs %zd needed)\n",

				 tlv_type, match, tlv_size);

				 tlv_type, match, tlv_size);

	}

	}

	return tlv;

	return tlv;

drivers/net/wimax/i2400m/usb-fw.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -212,7 +212,7 @@ ssize_t i2400mu_bus_bm_cmd_send(struct i2400m *i2400m, 
	}

	}

	if (result != cmd_size) {		/* all was transferred? */

	if (result != cmd_size) {		/* all was transferred? */

		dev_err(dev, "boot-mode cmd %d: incomplete transfer "

		dev_err(dev, "boot-mode cmd %d: incomplete transfer "

			"(%zu vs %zu submitted)\n",  opcode, result, cmd_size);

			"(%zd vs %zu submitted)\n",  opcode, result, cmd_size);

		result = -EIO;

		result = -EIO;

		goto error_cmd_size;

		goto error_cmd_size;

	}

	}