Message ID | 20220815142706.18369-1-jose.exposito89@gmail.com (mailing list archive) |
---|---|
State | Mainlined |
Commit | 609174edeb758d1e2d713e7ab4e09ea8d45aa4f7 |
Delegated to: | Jiri Kosina |
Headers | show |
Series | [RESEND] HID: uclogic: Fix warning in uclogic_rdesc_template_apply | expand |
On Mon, 15 Aug 2022, José Expósito wrote: > Building with Sparse enabled prints this warning: > > warning: incorrect type in assignment (different base types) > expected signed int x > got restricted __le32 [usertype] > > Cast the return value of cpu_to_le32() to fix the warning. > > Fixes: 08177f4 ("HID: uclogic: merge hid-huion driver in hid-uclogic") > Signed-off-by: José Expósito <jose.exposito89@gmail.com> > > --- > > Kindly resending this patch so it doesn't get lost after the merge > window. > --- > drivers/hid/hid-uclogic-rdesc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/hid/hid-uclogic-rdesc.c b/drivers/hid/hid-uclogic-rdesc.c > index 3d68e8b0784d..81ca22398ed5 100644 > --- a/drivers/hid/hid-uclogic-rdesc.c > +++ b/drivers/hid/hid-uclogic-rdesc.c > @@ -1113,7 +1113,7 @@ __u8 *uclogic_rdesc_template_apply(const __u8 *template_ptr, > memcmp(p, pen_head, sizeof(pen_head)) == 0 && > p[sizeof(pen_head)] < param_num) { > v = param_list[p[sizeof(pen_head)]]; > - put_unaligned(cpu_to_le32(v), (s32 *)p); > + put_unaligned((__force u32)cpu_to_le32(v), (s32 *)p); > p += sizeof(pen_head) + 1; > } else if (memcmp(p, btn_head, sizeof(btn_head)) == 0 && > p[sizeof(btn_head)] < param_num) { Applied, thank you José.
diff --git a/drivers/hid/hid-uclogic-rdesc.c b/drivers/hid/hid-uclogic-rdesc.c index 3d68e8b0784d..81ca22398ed5 100644 --- a/drivers/hid/hid-uclogic-rdesc.c +++ b/drivers/hid/hid-uclogic-rdesc.c @@ -1113,7 +1113,7 @@ __u8 *uclogic_rdesc_template_apply(const __u8 *template_ptr, memcmp(p, pen_head, sizeof(pen_head)) == 0 && p[sizeof(pen_head)] < param_num) { v = param_list[p[sizeof(pen_head)]]; - put_unaligned(cpu_to_le32(v), (s32 *)p); + put_unaligned((__force u32)cpu_to_le32(v), (s32 *)p); p += sizeof(pen_head) + 1; } else if (memcmp(p, btn_head, sizeof(btn_head)) == 0 && p[sizeof(btn_head)] < param_num) {
Building with Sparse enabled prints this warning: warning: incorrect type in assignment (different base types) expected signed int x got restricted __le32 [usertype] Cast the return value of cpu_to_le32() to fix the warning. Fixes: 08177f4 ("HID: uclogic: merge hid-huion driver in hid-uclogic") Signed-off-by: José Expósito <jose.exposito89@gmail.com> --- Kindly resending this patch so it doesn't get lost after the merge window. --- drivers/hid/hid-uclogic-rdesc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)