2022-07-20 06:01:47

by Aashish Sharma

Subject: [PATCH] HID: nintendo: Fix unused-const-variable compiler warning

The following compiler warning is produced when CONFIG_NINTENDO_FF
is not set:

>> drivers/hid/hid-nintendo.c:405:29: warning: 'JC_RUMBLE_ZERO_AMP_PKT_CNT'
defined but not used [-Wunused-const-variable=]

To fix this, move the variable 'JC_RUMBLE_ZERO_AMP_PKT_CNT' under the
CONFIG_NINTENDO_FF's conditional compilation block.

Signed-off-by: Aashish Sharma <[email protected]>
---
drivers/hid/hid-nintendo.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c
index 2204de889739..69de7504bdbc 100644
--- a/drivers/hid/hid-nintendo.c
+++ b/drivers/hid/hid-nintendo.c
@@ -402,8 +402,6 @@ struct joycon_input_report {
#define JC_RUMBLE_DATA_SIZE 8
#define JC_RUMBLE_QUEUE_SIZE 8

-static const unsigned short JC_RUMBLE_ZERO_AMP_PKT_CNT = 5;
-
static const char * const joycon_player_led_names[] = {
LED_FUNCTION_PLAYER1,
LED_FUNCTION_PLAYER2,
@@ -1512,6 +1510,8 @@ static void joycon_clamp_rumble_freqs(struct joycon_ctlr *ctlr)
spin_unlock_irqrestore(&ctlr->lock, flags);
}

+static const unsigned short JC_RUMBLE_ZERO_AMP_PKT_CNT = 5;
+
static int joycon_set_rumble(struct joycon_ctlr *ctlr, u16 amp_r, u16 amp_l,
bool schedule_now)
{
--
2.37.0.170.g444d1eabd0-goog

2022-07-20 15:43:33

by Guenter Roeck

Subject: Re: [PATCH] HID: nintendo: Fix unused-const-variable compiler warning

On Tue, Jul 19, 2022 at 10:43 PM Aashish Sharma <[email protected]> wrote:
>
> The following compiler warning is produced when CONFIG_NINTENDO_FF
> is not set:
>
> >> drivers/hid/hid-nintendo.c:405:29: warning: 'JC_RUMBLE_ZERO_AMP_PKT_CNT'
> defined but not used [-Wunused-const-variable=]
>
> To fix this, move the variable 'JC_RUMBLE_ZERO_AMP_PKT_CNT' under the
> CONFIG_NINTENDO_FF's conditional compilation block.
>
> Signed-off-by: Aashish Sharma <[email protected]>

Reviewed-by: Guenter Roeck <[email protected]>

> ---
> drivers/hid/hid-nintendo.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c
> index 2204de889739..69de7504bdbc 100644
> --- a/drivers/hid/hid-nintendo.c
> +++ b/drivers/hid/hid-nintendo.c
> @@ -402,8 +402,6 @@ struct joycon_input_report {
> #define JC_RUMBLE_DATA_SIZE 8
> #define JC_RUMBLE_QUEUE_SIZE 8
>
> -static const unsigned short JC_RUMBLE_ZERO_AMP_PKT_CNT = 5;
> -
> static const char * const joycon_player_led_names[] = {
> LED_FUNCTION_PLAYER1,
> LED_FUNCTION_PLAYER2,
> @@ -1512,6 +1510,8 @@ static void joycon_clamp_rumble_freqs(struct joycon_ctlr *ctlr)
> spin_unlock_irqrestore(&ctlr->lock, flags);
> }
>
> +static const unsigned short JC_RUMBLE_ZERO_AMP_PKT_CNT = 5;
> +
> static int joycon_set_rumble(struct joycon_ctlr *ctlr, u16 amp_r, u16 amp_l,
> bool schedule_now)
> {
> --
> 2.37.0.170.g444d1eabd0-goog
>

2022-07-22 13:27:02

by Jiri Kosina

Subject: Re: [PATCH] HID: nintendo: Fix unused-const-variable compiler warning

On Wed, 20 Jul 2022, Aashish Sharma wrote:

> The following compiler warning is produced when CONFIG_NINTENDO_FF
> is not set:
>
> >> drivers/hid/hid-nintendo.c:405:29: warning: 'JC_RUMBLE_ZERO_AMP_PKT_CNT'
> defined but not used [-Wunused-const-variable=]
>
> To fix this, move the variable 'JC_RUMBLE_ZERO_AMP_PKT_CNT' under the
> CONFIG_NINTENDO_FF's conditional compilation block.
>
> Signed-off-by: Aashish Sharma <[email protected]>

Applied to for-5.20/ninitendo. Thanks,

--
Jiri Kosina
SUSE Labs