| Message ID | 20220528212331.3460905-1-djogorchock@gmail.com |
|---|---|
| State | Accepted |
| Commit | 92cdfba40155aab313d307eecbaef331b447fe54 |
| Headers | show |
| Series | HID: nintendo: fix unused const warning | expand |
"Daniel J. Ogorchock" <djogorchock@gmail.com> wrote: > JC_RUMBLE_ZERO_AMP_PKT_CNT is only used when force feedback support in > the driver is enabled. Place the declaration in the CONFIG_NINTENDO_FF > ifdef to avoid a warning when compiling without rumble support. > > Signed-off-by: Daniel J. Ogorchock <djogorchock@gmail.com> > --- LGTM! Reviewed-by: Silvan Jegen <s.jegen@gmail.com> > [...]
On Sat, 28 May 2022, Daniel J. Ogorchock wrote: > JC_RUMBLE_ZERO_AMP_PKT_CNT is only used when force feedback support in > the driver is enabled. Place the declaration in the CONFIG_NINTENDO_FF > ifdef to avoid a warning when compiling without rumble support. > > Signed-off-by: Daniel J. Ogorchock <djogorchock@gmail.com> > --- > drivers/hid/hid-nintendo.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c > index 2204de889739f..dcd0f16de7b51 100644 > --- a/drivers/hid/hid-nintendo.c > +++ b/drivers/hid/hid-nintendo.c > @@ -292,6 +292,7 @@ static const struct joycon_rumble_amp_data joycon_rumble_amplitudes[] = { > }; > static const u16 JC_RUMBLE_DFLT_LOW_FREQ = 160; > static const u16 JC_RUMBLE_DFLT_HIGH_FREQ = 320; > +static const unsigned short JC_RUMBLE_ZERO_AMP_PKT_CNT = 5; > #endif /* IS_ENABLED(CONFIG_NINTENDO_FF) */ > static const u16 JC_RUMBLE_PERIOD_MS = 50; > > @@ -402,8 +403,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, Applied, thanks Daniel.
diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c index 2204de889739f..dcd0f16de7b51 100644 --- a/drivers/hid/hid-nintendo.c +++ b/drivers/hid/hid-nintendo.c @@ -292,6 +292,7 @@ static const struct joycon_rumble_amp_data joycon_rumble_amplitudes[] = { }; static const u16 JC_RUMBLE_DFLT_LOW_FREQ = 160; static const u16 JC_RUMBLE_DFLT_HIGH_FREQ = 320; +static const unsigned short JC_RUMBLE_ZERO_AMP_PKT_CNT = 5; #endif /* IS_ENABLED(CONFIG_NINTENDO_FF) */ static const u16 JC_RUMBLE_PERIOD_MS = 50; @@ -402,8 +403,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,
JC_RUMBLE_ZERO_AMP_PKT_CNT is only used when force feedback support in the driver is enabled. Place the declaration in the CONFIG_NINTENDO_FF ifdef to avoid a warning when compiling without rumble support. Signed-off-by: Daniel J. Ogorchock <djogorchock@gmail.com> --- drivers/hid/hid-nintendo.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)