* Re: [PATCH] HID: quirks: use correct format chars in dbg_hid
2019-02-26 23:48 [PATCH] HID: quirks: use correct format chars in dbg_hid Louis Taylor
@ 2019-02-27 0:27 ` Nick Desaulniers
2019-02-27 9:57 ` Benjamin Tissoires
2019-02-27 11:07 ` [PATCH v2] " Louis Taylor
2 siblings, 0 replies; 6+ messages in thread
From: Nick Desaulniers @ 2019-02-27 0:27 UTC (permalink / raw)
To: Louis Taylor
Cc: Jiri Kosina, benjamin.tissoires, linux-input, LKML,
clang-built-linux, Jon Flatley, Matthias Männich
On Tue, Feb 26, 2019 at 3:50 PM Louis Taylor <louis@kragniz.eu> wrote:
>
> When building with -Wformat, clang warns:
>
> drivers/hid/hid-quirks.c:1075:27: warning: format specifies type
> 'unsigned short' but the argument has type '__u32' (aka 'unsigned int')
> [-Wformat]
> bl_entry->driver_data, bl_entry->vendor,
> ^~~~~~~~~~~~~~~~
> ./include/linux/hid.h:1170:48: note: expanded from macro 'dbg_hid'
> printk(KERN_DEBUG "%s: " format, __FILE__, ##arg); \
> ~~~~~~ ^~~
> drivers/hid/hid-quirks.c:1076:4: warning: format specifies type
> 'unsigned short' but the argument has type '__u32' (aka 'unsigned int')
> [-Wformat]
> bl_entry->product);
> ^~~~~~~~~~~~~~~~~
> ./include/linux/hid.h:1170:48: note: expanded from macro 'dbg_hid'
> printk(KERN_DEBUG "%s: " format, __FILE__, ##arg); \
> ~~~~~~ ^~~
> drivers/hid/hid-quirks.c:1242:12: warning: format specifies type
> 'unsigned short' but the argument has type '__u32' (aka 'unsigned int')
> [-Wformat]
> quirks, hdev->vendor, hdev->product);
> ^~~~~~~~~~~~
> ./include/linux/hid.h:1170:48: note: expanded from macro 'dbg_hid'
> printk(KERN_DEBUG "%s: " format, __FILE__, ##arg); \
> ~~~~~~ ^~~
> drivers/hid/hid-quirks.c:1242:26: warning: format specifies type
> 'unsigned short' but the argument has type '__u32' (aka 'unsigned int')
> [-Wformat]
> quirks, hdev->vendor, hdev->product);
> ^~~~~~~~~~~~~
> ./include/linux/hid.h:1170:48: note: expanded from macro 'dbg_hid'
> printk(KERN_DEBUG "%s: " format, __FILE__, ##arg); \
> ~~~~~~ ^~~
> 4 warnings generated.
>
> This patch fixes the format strings to use the correct format type for unsigned
> ints.
>
> Link: https://github.com/ClangBuiltLinux/linux/issues/378
> Signed-off-by: Louis Taylor <louis@kragniz.eu>
> ---
> drivers/hid/hid-quirks.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
> index 94088c0ed68a..b4e49e1b6f4a 100644
> --- a/drivers/hid/hid-quirks.c
> +++ b/drivers/hid/hid-quirks.c
> @@ -1071,7 +1071,7 @@ static struct hid_device_id *hid_exists_dquirk(const struct hid_device *hdev)
> }
>
> if (bl_entry != NULL)
> - dbg_hid("Found dynamic quirk 0x%lx for HID device 0x%hx:0x%hx\n",
> + dbg_hid("Found dynamic quirk 0x%lx for HID device 0x%x:0x%x\n",
%h is for short ints, include/linux/mod_devicetable.h declares struct
hid_device_id (bl_entry is an instance of struct hid_device_id)
unconditionally as:
147 struct hid_device_id {
...
150 __u32 vendor;
151 __u32 product;
...
153 };
yep; LGTM
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Thank you for the patch! There's 3 more of these in
drivers/hid/i2c-hid/i2c-hid-core.c if your looking to clean up some
more!
> bl_entry->driver_data, bl_entry->vendor,
> bl_entry->product);
>
> @@ -1238,7 +1238,7 @@ static unsigned long hid_gets_squirk(const struct hid_device *hdev)
> quirks |= bl_entry->driver_data;
>
> if (quirks)
> - dbg_hid("Found squirk 0x%lx for HID device 0x%hx:0x%hx\n",
> + dbg_hid("Found squirk 0x%lx for HID device 0x%x:0x%x\n",
> quirks, hdev->vendor, hdev->product);
> return quirks;
> }
> --
> 2.20.1
>
--
Thanks,
~Nick Desaulniers
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] HID: quirks: use correct format chars in dbg_hid
2019-02-26 23:48 [PATCH] HID: quirks: use correct format chars in dbg_hid Louis Taylor
2019-02-27 0:27 ` Nick Desaulniers
@ 2019-02-27 9:57 ` Benjamin Tissoires
2019-02-27 11:07 ` [PATCH v2] " Louis Taylor
2 siblings, 0 replies; 6+ messages in thread
From: Benjamin Tissoires @ 2019-02-27 9:57 UTC (permalink / raw)
To: Louis Taylor
Cc: Jiri Kosina, open list:HID CORE LAYER, lkml, clang-built-linux,
ndesaulniers
On Wed, Feb 27, 2019 at 12:50 AM Louis Taylor <louis@kragniz.eu> wrote:
>
> When building with -Wformat, clang warns:
>
> drivers/hid/hid-quirks.c:1075:27: warning: format specifies type
> 'unsigned short' but the argument has type '__u32' (aka 'unsigned int')
> [-Wformat]
> bl_entry->driver_data, bl_entry->vendor,
> ^~~~~~~~~~~~~~~~
> ./include/linux/hid.h:1170:48: note: expanded from macro 'dbg_hid'
> printk(KERN_DEBUG "%s: " format, __FILE__, ##arg); \
> ~~~~~~ ^~~
> drivers/hid/hid-quirks.c:1076:4: warning: format specifies type
> 'unsigned short' but the argument has type '__u32' (aka 'unsigned int')
> [-Wformat]
> bl_entry->product);
> ^~~~~~~~~~~~~~~~~
> ./include/linux/hid.h:1170:48: note: expanded from macro 'dbg_hid'
> printk(KERN_DEBUG "%s: " format, __FILE__, ##arg); \
> ~~~~~~ ^~~
> drivers/hid/hid-quirks.c:1242:12: warning: format specifies type
> 'unsigned short' but the argument has type '__u32' (aka 'unsigned int')
> [-Wformat]
> quirks, hdev->vendor, hdev->product);
> ^~~~~~~~~~~~
> ./include/linux/hid.h:1170:48: note: expanded from macro 'dbg_hid'
> printk(KERN_DEBUG "%s: " format, __FILE__, ##arg); \
> ~~~~~~ ^~~
> drivers/hid/hid-quirks.c:1242:26: warning: format specifies type
> 'unsigned short' but the argument has type '__u32' (aka 'unsigned int')
> [-Wformat]
> quirks, hdev->vendor, hdev->product);
> ^~~~~~~~~~~~~
> ./include/linux/hid.h:1170:48: note: expanded from macro 'dbg_hid'
> printk(KERN_DEBUG "%s: " format, __FILE__, ##arg); \
> ~~~~~~ ^~~
> 4 warnings generated.
>
> This patch fixes the format strings to use the correct format type for unsigned
> ints.
>
> Link: https://github.com/ClangBuiltLinux/linux/issues/378
> Signed-off-by: Louis Taylor <louis@kragniz.eu>
> ---
> drivers/hid/hid-quirks.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
> index 94088c0ed68a..b4e49e1b6f4a 100644
> --- a/drivers/hid/hid-quirks.c
> +++ b/drivers/hid/hid-quirks.c
> @@ -1071,7 +1071,7 @@ static struct hid_device_id *hid_exists_dquirk(const struct hid_device *hdev)
> }
>
> if (bl_entry != NULL)
> - dbg_hid("Found dynamic quirk 0x%lx for HID device 0x%hx:0x%hx\n",
> + dbg_hid("Found dynamic quirk 0x%lx for HID device 0x%x:0x%x\n",
Can you make it %04x instead?
The VID/PID are usually 4 hex chars, and without the '04' format,
you'll end up having a varying length result, which is not that nice.
Cheers,
Benjamin
> bl_entry->driver_data, bl_entry->vendor,
> bl_entry->product);
>
> @@ -1238,7 +1238,7 @@ static unsigned long hid_gets_squirk(const struct hid_device *hdev)
> quirks |= bl_entry->driver_data;
>
> if (quirks)
> - dbg_hid("Found squirk 0x%lx for HID device 0x%hx:0x%hx\n",
> + dbg_hid("Found squirk 0x%lx for HID device 0x%x:0x%x\n",
> quirks, hdev->vendor, hdev->product);
> return quirks;
> }
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v2] HID: quirks: use correct format chars in dbg_hid
2019-02-26 23:48 [PATCH] HID: quirks: use correct format chars in dbg_hid Louis Taylor
2019-02-27 0:27 ` Nick Desaulniers
2019-02-27 9:57 ` Benjamin Tissoires
@ 2019-02-27 11:07 ` Louis Taylor
2019-02-27 19:42 ` Nick Desaulniers
2 siblings, 1 reply; 6+ messages in thread
From: Louis Taylor @ 2019-02-27 11:07 UTC (permalink / raw)
To: jikos
Cc: benjamin.tissoires, linux-input, linux-kernel, clang-built-linux,
ndesaulniers, Louis Taylor
When building with -Wformat, clang warns:
drivers/hid/hid-quirks.c:1075:27: warning: format specifies type
'unsigned short' but the argument has type '__u32' (aka 'unsigned int')
[-Wformat]
bl_entry->driver_data, bl_entry->vendor,
^~~~~~~~~~~~~~~~
./include/linux/hid.h:1170:48: note: expanded from macro 'dbg_hid'
printk(KERN_DEBUG "%s: " format, __FILE__, ##arg); \
~~~~~~ ^~~
drivers/hid/hid-quirks.c:1076:4: warning: format specifies type
'unsigned short' but the argument has type '__u32' (aka 'unsigned int')
[-Wformat]
bl_entry->product);
^~~~~~~~~~~~~~~~~
./include/linux/hid.h:1170:48: note: expanded from macro 'dbg_hid'
printk(KERN_DEBUG "%s: " format, __FILE__, ##arg); \
~~~~~~ ^~~
drivers/hid/hid-quirks.c:1242:12: warning: format specifies type
'unsigned short' but the argument has type '__u32' (aka 'unsigned int')
[-Wformat]
quirks, hdev->vendor, hdev->product);
^~~~~~~~~~~~
./include/linux/hid.h:1170:48: note: expanded from macro 'dbg_hid'
printk(KERN_DEBUG "%s: " format, __FILE__, ##arg); \
~~~~~~ ^~~
drivers/hid/hid-quirks.c:1242:26: warning: format specifies type
'unsigned short' but the argument has type '__u32' (aka 'unsigned int')
[-Wformat]
quirks, hdev->vendor, hdev->product);
^~~~~~~~~~~~~
./include/linux/hid.h:1170:48: note: expanded from macro 'dbg_hid'
printk(KERN_DEBUG "%s: " format, __FILE__, ##arg); \
~~~~~~ ^~~
4 warnings generated.
This patch fixes the format strings to use the correct format type for unsigned
ints.
Link: https://github.com/ClangBuiltLinux/linux/issues/378
Signed-off-by: Louis Taylor <louis@kragniz.eu>
---
v2: change format string to use %04x instead of %x
drivers/hid/hid-quirks.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
index 94088c0ed68a..b608a57b7908 100644
--- a/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c
@@ -1071,7 +1071,7 @@ static struct hid_device_id *hid_exists_dquirk(const struct hid_device *hdev)
}
if (bl_entry != NULL)
- dbg_hid("Found dynamic quirk 0x%lx for HID device 0x%hx:0x%hx\n",
+ dbg_hid("Found dynamic quirk 0x%lx for HID device 0x%04x:0x%04x\n",
bl_entry->driver_data, bl_entry->vendor,
bl_entry->product);
@@ -1238,7 +1238,7 @@ static unsigned long hid_gets_squirk(const struct hid_device *hdev)
quirks |= bl_entry->driver_data;
if (quirks)
- dbg_hid("Found squirk 0x%lx for HID device 0x%hx:0x%hx\n",
+ dbg_hid("Found squirk 0x%lx for HID device 0x%04x:0x%04x\n",
quirks, hdev->vendor, hdev->product);
return quirks;
}
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2] HID: quirks: use correct format chars in dbg_hid
2019-02-27 11:07 ` [PATCH v2] " Louis Taylor
@ 2019-02-27 19:42 ` Nick Desaulniers
2019-03-11 14:56 ` Benjamin Tissoires
0 siblings, 1 reply; 6+ messages in thread
From: Nick Desaulniers @ 2019-02-27 19:42 UTC (permalink / raw)
To: Louis Taylor
Cc: Jiri Kosina, benjamin.tissoires, linux-input, LKML, clang-built-linux
On Wed, Feb 27, 2019 at 3:08 AM Louis Taylor <louis@kragniz.eu> wrote:
>
> When building with -Wformat, clang warns:
>
> drivers/hid/hid-quirks.c:1075:27: warning: format specifies type
> 'unsigned short' but the argument has type '__u32' (aka 'unsigned int')
> [-Wformat]
> bl_entry->driver_data, bl_entry->vendor,
> ^~~~~~~~~~~~~~~~
> ./include/linux/hid.h:1170:48: note: expanded from macro 'dbg_hid'
> printk(KERN_DEBUG "%s: " format, __FILE__, ##arg); \
> ~~~~~~ ^~~
> drivers/hid/hid-quirks.c:1076:4: warning: format specifies type
> 'unsigned short' but the argument has type '__u32' (aka 'unsigned int')
> [-Wformat]
> bl_entry->product);
> ^~~~~~~~~~~~~~~~~
> ./include/linux/hid.h:1170:48: note: expanded from macro 'dbg_hid'
> printk(KERN_DEBUG "%s: " format, __FILE__, ##arg); \
> ~~~~~~ ^~~
> drivers/hid/hid-quirks.c:1242:12: warning: format specifies type
> 'unsigned short' but the argument has type '__u32' (aka 'unsigned int')
> [-Wformat]
> quirks, hdev->vendor, hdev->product);
> ^~~~~~~~~~~~
> ./include/linux/hid.h:1170:48: note: expanded from macro 'dbg_hid'
> printk(KERN_DEBUG "%s: " format, __FILE__, ##arg); \
> ~~~~~~ ^~~
> drivers/hid/hid-quirks.c:1242:26: warning: format specifies type
> 'unsigned short' but the argument has type '__u32' (aka 'unsigned int')
> [-Wformat]
> quirks, hdev->vendor, hdev->product);
> ^~~~~~~~~~~~~
> ./include/linux/hid.h:1170:48: note: expanded from macro 'dbg_hid'
> printk(KERN_DEBUG "%s: " format, __FILE__, ##arg); \
> ~~~~~~ ^~~
> 4 warnings generated.
>
> This patch fixes the format strings to use the correct format type for unsigned
> ints.
>
> Link: https://github.com/ClangBuiltLinux/linux/issues/378
> Signed-off-by: Louis Taylor <louis@kragniz.eu>
Thanks for following up on the feedback.
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
> ---
>
> v2: change format string to use %04x instead of %x
>
> drivers/hid/hid-quirks.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
> index 94088c0ed68a..b608a57b7908 100644
> --- a/drivers/hid/hid-quirks.c
> +++ b/drivers/hid/hid-quirks.c
> @@ -1071,7 +1071,7 @@ static struct hid_device_id *hid_exists_dquirk(const struct hid_device *hdev)
> }
>
> if (bl_entry != NULL)
> - dbg_hid("Found dynamic quirk 0x%lx for HID device 0x%hx:0x%hx\n",
> + dbg_hid("Found dynamic quirk 0x%lx for HID device 0x%04x:0x%04x\n",
> bl_entry->driver_data, bl_entry->vendor,
> bl_entry->product);
>
> @@ -1238,7 +1238,7 @@ static unsigned long hid_gets_squirk(const struct hid_device *hdev)
> quirks |= bl_entry->driver_data;
>
> if (quirks)
> - dbg_hid("Found squirk 0x%lx for HID device 0x%hx:0x%hx\n",
> + dbg_hid("Found squirk 0x%lx for HID device 0x%04x:0x%04x\n",
> quirks, hdev->vendor, hdev->product);
> return quirks;
> }
> --
> 2.20.1
>
--
Thanks,
~Nick Desaulniers
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2] HID: quirks: use correct format chars in dbg_hid
2019-02-27 19:42 ` Nick Desaulniers
@ 2019-03-11 14:56 ` Benjamin Tissoires
0 siblings, 0 replies; 6+ messages in thread
From: Benjamin Tissoires @ 2019-03-11 14:56 UTC (permalink / raw)
To: Nick Desaulniers
Cc: Louis Taylor, Jiri Kosina, open list:HID CORE LAYER, LKML,
clang-built-linux
On Wed, Feb 27, 2019 at 8:43 PM Nick Desaulniers
<ndesaulniers@google.com> wrote:
>
> On Wed, Feb 27, 2019 at 3:08 AM Louis Taylor <louis@kragniz.eu> wrote:
> >
> > When building with -Wformat, clang warns:
> >
> > drivers/hid/hid-quirks.c:1075:27: warning: format specifies type
> > 'unsigned short' but the argument has type '__u32' (aka 'unsigned int')
> > [-Wformat]
> > bl_entry->driver_data, bl_entry->vendor,
> > ^~~~~~~~~~~~~~~~
> > ./include/linux/hid.h:1170:48: note: expanded from macro 'dbg_hid'
> > printk(KERN_DEBUG "%s: " format, __FILE__, ##arg); \
> > ~~~~~~ ^~~
> > drivers/hid/hid-quirks.c:1076:4: warning: format specifies type
> > 'unsigned short' but the argument has type '__u32' (aka 'unsigned int')
> > [-Wformat]
> > bl_entry->product);
> > ^~~~~~~~~~~~~~~~~
> > ./include/linux/hid.h:1170:48: note: expanded from macro 'dbg_hid'
> > printk(KERN_DEBUG "%s: " format, __FILE__, ##arg); \
> > ~~~~~~ ^~~
> > drivers/hid/hid-quirks.c:1242:12: warning: format specifies type
> > 'unsigned short' but the argument has type '__u32' (aka 'unsigned int')
> > [-Wformat]
> > quirks, hdev->vendor, hdev->product);
> > ^~~~~~~~~~~~
> > ./include/linux/hid.h:1170:48: note: expanded from macro 'dbg_hid'
> > printk(KERN_DEBUG "%s: " format, __FILE__, ##arg); \
> > ~~~~~~ ^~~
> > drivers/hid/hid-quirks.c:1242:26: warning: format specifies type
> > 'unsigned short' but the argument has type '__u32' (aka 'unsigned int')
> > [-Wformat]
> > quirks, hdev->vendor, hdev->product);
> > ^~~~~~~~~~~~~
> > ./include/linux/hid.h:1170:48: note: expanded from macro 'dbg_hid'
> > printk(KERN_DEBUG "%s: " format, __FILE__, ##arg); \
> > ~~~~~~ ^~~
> > 4 warnings generated.
> >
> > This patch fixes the format strings to use the correct format type for unsigned
> > ints.
> >
> > Link: https://github.com/ClangBuiltLinux/linux/issues/378
> > Signed-off-by: Louis Taylor <louis@kragniz.eu>
>
> Thanks for following up on the feedback.
> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Applied to for-5.1/upstream-fixes
Cheers,
Benjamin
>
> > ---
> >
> > v2: change format string to use %04x instead of %x
> >
> > drivers/hid/hid-quirks.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
> > index 94088c0ed68a..b608a57b7908 100644
> > --- a/drivers/hid/hid-quirks.c
> > +++ b/drivers/hid/hid-quirks.c
> > @@ -1071,7 +1071,7 @@ static struct hid_device_id *hid_exists_dquirk(const struct hid_device *hdev)
> > }
> >
> > if (bl_entry != NULL)
> > - dbg_hid("Found dynamic quirk 0x%lx for HID device 0x%hx:0x%hx\n",
> > + dbg_hid("Found dynamic quirk 0x%lx for HID device 0x%04x:0x%04x\n",
> > bl_entry->driver_data, bl_entry->vendor,
> > bl_entry->product);
> >
> > @@ -1238,7 +1238,7 @@ static unsigned long hid_gets_squirk(const struct hid_device *hdev)
> > quirks |= bl_entry->driver_data;
> >
> > if (quirks)
> > - dbg_hid("Found squirk 0x%lx for HID device 0x%hx:0x%hx\n",
> > + dbg_hid("Found squirk 0x%lx for HID device 0x%04x:0x%04x\n",
> > quirks, hdev->vendor, hdev->product);
> > return quirks;
> > }
> > --
> > 2.20.1
> >
>
>
> --
> Thanks,
> ~Nick Desaulniers
^ permalink raw reply [flat|nested] 6+ messages in thread