| Message ID | 20190919091532.24951-1-geert@linux-m68k.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6355592e6b55be8c568b62efba5fe5a1c919a2db |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [-net] zd1211rw: zd_usb: Use "%zu" to format size_t | expand |
Geert Uytterhoeven <geert@linux-m68k.org> writes: > On 32-bit: > > drivers/net/wireless/zydas/zd1211rw/zd_usb.c: In function ‘check_read_regs’: > drivers/net/wireless/zydas/zd1211rw/zd_def.h:18:25: warning: format ‘%ld’ expects argument of type ‘long int’, but argument 6 has type ‘size_t’ {aka ‘unsigned int’} [-Wformat=] > dev_printk(level, dev, "%s() " fmt, __func__, ##args) > ^~~~~~~ > drivers/net/wireless/zydas/zd1211rw/zd_def.h:22:4: note: in expansion of macro ‘dev_printk_f’ > dev_printk_f(KERN_DEBUG, dev, fmt, ## args) > ^~~~~~~~~~~~ > drivers/net/wireless/zydas/zd1211rw/zd_usb.c:1635:3: note: in expansion of macro ‘dev_dbg_f’ > dev_dbg_f(zd_usb_dev(usb), > ^~~~~~~~~ > drivers/net/wireless/zydas/zd1211rw/zd_usb.c:1636:51: note: format string is defined here > "error: actual length %d less than expected %ld\n", > ~~^ > %d > > Fixes: 84b0b66352470e64 ("zd1211rw: zd_usb: Use struct_size() helper") > Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> I'll queue this for v5.4.
Geert Uytterhoeven <geert@linux-m68k.org> wrote: > On 32-bit: > > drivers/net/wireless/zydas/zd1211rw/zd_usb.c: In function ‘check_read_regs’: > drivers/net/wireless/zydas/zd1211rw/zd_def.h:18:25: warning: format ‘%ld’ expects argument of type ‘long int’, but argument 6 has type ‘size_t’ {aka ‘unsigned int’} [-Wformat=] > dev_printk(level, dev, "%s() " fmt, __func__, ##args) > ^~~~~~~ > drivers/net/wireless/zydas/zd1211rw/zd_def.h:22:4: note: in expansion of macro ‘dev_printk_f’ > dev_printk_f(KERN_DEBUG, dev, fmt, ## args) > ^~~~~~~~~~~~ > drivers/net/wireless/zydas/zd1211rw/zd_usb.c:1635:3: note: in expansion of macro ‘dev_dbg_f’ > dev_dbg_f(zd_usb_dev(usb), > ^~~~~~~~~ > drivers/net/wireless/zydas/zd1211rw/zd_usb.c:1636:51: note: format string is defined here > "error: actual length %d less than expected %ld\n", > ~~^ > %d > > Fixes: 84b0b66352470e64 ("zd1211rw: zd_usb: Use struct_size() helper") > Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Patch applied to wireless-drivers.git, thanks. 6355592e6b55 zd1211rw: zd_usb: Use "%zu" to format size_t
diff --git a/drivers/net/wireless/zydas/zd1211rw/zd_usb.c b/drivers/net/wireless/zydas/zd1211rw/zd_usb.c index 4e44ea8c652d65aa..7b5c2fe5bd4d9cde 100644 --- a/drivers/net/wireless/zydas/zd1211rw/zd_usb.c +++ b/drivers/net/wireless/zydas/zd1211rw/zd_usb.c @@ -1633,7 +1633,7 @@ static bool check_read_regs(struct zd_usb *usb, struct usb_req_read_regs *req, */ if (rr->length < struct_size(regs, regs, count)) { dev_dbg_f(zd_usb_dev(usb), - "error: actual length %d less than expected %ld\n", + "error: actual length %d less than expected %zu\n", rr->length, struct_size(regs, regs, count)); return false; }
On 32-bit: drivers/net/wireless/zydas/zd1211rw/zd_usb.c: In function ‘check_read_regs’: drivers/net/wireless/zydas/zd1211rw/zd_def.h:18:25: warning: format ‘%ld’ expects argument of type ‘long int’, but argument 6 has type ‘size_t’ {aka ‘unsigned int’} [-Wformat=] dev_printk(level, dev, "%s() " fmt, __func__, ##args) ^~~~~~~ drivers/net/wireless/zydas/zd1211rw/zd_def.h:22:4: note: in expansion of macro ‘dev_printk_f’ dev_printk_f(KERN_DEBUG, dev, fmt, ## args) ^~~~~~~~~~~~ drivers/net/wireless/zydas/zd1211rw/zd_usb.c:1635:3: note: in expansion of macro ‘dev_dbg_f’ dev_dbg_f(zd_usb_dev(usb), ^~~~~~~~~ drivers/net/wireless/zydas/zd1211rw/zd_usb.c:1636:51: note: format string is defined here "error: actual length %d less than expected %ld\n", ~~^ %d Fixes: 84b0b66352470e64 ("zd1211rw: zd_usb: Use struct_size() helper") Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> --- drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)