The hid-logitech-{dj,hidpp} were originally developed for unifying
receivers but since then they have evolved and now support other types
of receivers and devices. This patch adjusts the original descriptions
with this in mind.
Signed-off-by: Filipe Laíns <[email protected]>
---
drivers/hid/Kconfig | 6 +++---
drivers/hid/hid-logitech-dj.c | 4 ++--
drivers/hid/hid-logitech-hidpp.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 494a39e74939..56f9f16220e3 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -531,14 +531,14 @@ config HID_LOGITECH
Support for Logitech devices that are not fully compliant with HID standard.
config HID_LOGITECH_DJ
- tristate "Logitech Unifying receivers full support"
+ tristate "Logitech receivers full support"
depends on USB_HID
depends on HIDRAW
depends on HID_LOGITECH
select HID_LOGITECH_HIDPP
---help---
- Say Y if you want support for Logitech Unifying receivers and devices.
- Unifying receivers are capable of pairing up to 6 Logitech compliant
+ Say Y if you want support for Logitech receivers and devices.
+ Logitech receivers are capable of pairing multiple Logitech compliant
devices to the same receiver. Without this driver it will be handled by
generic USB_HID driver and all incoming events will be multiplexed
into a single mouse and a single keyboard device.
diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
index 732380b55b15..cc7fc71d8b05 100644
--- a/drivers/hid/hid-logitech-dj.c
+++ b/drivers/hid/hid-logitech-dj.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * HID driver for Logitech Unifying receivers
+ * HID driver for Logitech receivers
*
* Copyright (c) 2011 Logitech
*/
@@ -701,7 +701,7 @@ static void logi_dj_recv_add_djhid_device(struct dj_receiver_dev *djrcv_dev,
type_str, dj_hiddev->product);
} else {
snprintf(dj_hiddev->name, sizeof(dj_hiddev->name),
- "Logitech Unifying Device. Wireless PID:%04x",
+ "Logitech Wireless Device PID:%04x",
dj_hiddev->product);
}
diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
index 39a5ee0aaab0..c04018f8a727 100644
--- a/drivers/hid/hid-logitech-hidpp.c
+++ b/drivers/hid/hid-logitech-hidpp.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * HIDPP protocol for Logitech Unifying receivers
+ * HIDPP protocol for Logitech receivers
*
* Copyright (c) 2011 Logitech (c)
* Copyright (c) 2012-2013 Google (c)
--
2.24.1
On Sun, 12 Jan 2020, Filipe Laíns wrote:
> The hid-logitech-{dj,hidpp} were originally developed for unifying
> receivers but since then they have evolved and now support other types
> of receivers and devices. This patch adjusts the original descriptions
> with this in mind.
[ CCing Nestor ]
Benjamin, Nestor, can I please get your Ack (as authors of the original
code)?
Thanks,
--
Jiri Kosina
SUSE Labs
On Sun, 12 Jan 2020, Filipe Laíns wrote:
> The hid-logitech-{dj,hidpp} were originally developed for unifying
> receivers but since then they have evolved and now support other types
> of receivers and devices. This patch adjusts the original descriptions
> with this in mind.
Benjamin, I guess you are fine with this change ... ?
Thanks,
--
Jiri Kosina
SUSE Labs
On Fri, Apr 3, 2020 at 3:31 PM Jiri Kosina <[email protected]> wrote:
>
> On Sun, 12 Jan 2020, Filipe Laíns wrote:
>
> > The hid-logitech-{dj,hidpp} were originally developed for unifying
> > receivers but since then they have evolved and now support other types
> > of receivers and devices. This patch adjusts the original descriptions
> > with this in mind.
>
> Benjamin, I guess you are fine with this change ... ?
Yes, work for me.
[Sorry for being unresponsive for a while, got a bunch of things on my
plate right now :( ]
Cheers,
Benjamin
>
> Thanks,
>
> --
> Jiri Kosina
> SUSE Labs
>
On Sun, 12 Jan 2020, Filipe Laíns wrote:
> The hid-logitech-{dj,hidpp} were originally developed for unifying
> receivers but since then they have evolved and now support other types
> of receivers and devices. This patch adjusts the original descriptions
> with this in mind.
>
> Signed-off-by: Filipe Laíns <[email protected]>
Applied, thanks Filipe.
--
Jiri Kosina
SUSE Labs