Skip to content

Commit 2fe9022

Browse files
author
Benjamin Tissoires
committed
Merge branch 'for-6.11/nintendo' into for-linus
Cleanup unused functions in hid-nintendo by Jiapeng Chong
2 parents d0dcd19 + 09bae58 commit 2fe9022

File tree

1 file changed

+0
-21
lines changed

1 file changed

+0
-21
lines changed

drivers/hid/hid-nintendo.c

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,6 @@ struct joycon_ctlr {
658658
(ctlr->ctlr_type == JOYCON_CTLR_TYPE_JCR || \
659659
ctlr->ctlr_type == JOYCON_CTLR_TYPE_PRO)
660660

661-
662661
/*
663662
* Controller device helpers
664663
*
@@ -669,31 +668,11 @@ struct joycon_ctlr {
669668
* These helpers are most useful early during the HID probe or in conjunction
670669
* with the capability helpers below.
671670
*/
672-
static inline bool joycon_device_is_procon(struct joycon_ctlr *ctlr)
673-
{
674-
return ctlr->hdev->product == USB_DEVICE_ID_NINTENDO_PROCON;
675-
}
676-
677671
static inline bool joycon_device_is_chrggrip(struct joycon_ctlr *ctlr)
678672
{
679673
return ctlr->hdev->product == USB_DEVICE_ID_NINTENDO_CHRGGRIP;
680674
}
681675

682-
static inline bool joycon_device_is_snescon(struct joycon_ctlr *ctlr)
683-
{
684-
return ctlr->hdev->product == USB_DEVICE_ID_NINTENDO_SNESCON;
685-
}
686-
687-
static inline bool joycon_device_is_gencon(struct joycon_ctlr *ctlr)
688-
{
689-
return ctlr->hdev->product == USB_DEVICE_ID_NINTENDO_GENCON;
690-
}
691-
692-
static inline bool joycon_device_is_n64con(struct joycon_ctlr *ctlr)
693-
{
694-
return ctlr->hdev->product == USB_DEVICE_ID_NINTENDO_N64CON;
695-
}
696-
697676
/*
698677
* Controller type helpers
699678
*

0 commit comments

Comments
 (0)