Merge branch 'for-6.11/nintendo' into for-linus

Cleanup unused functions in hid-nintendo by Jiapeng Chong
This commit is contained in:
Benjamin Tissoires 2024-07-16 12:24:04 +02:00
commit 2fe90223eb

View File

@ -658,7 +658,6 @@ struct joycon_ctlr {
(ctlr->ctlr_type == JOYCON_CTLR_TYPE_JCR || \
ctlr->ctlr_type == JOYCON_CTLR_TYPE_PRO)
/*
* Controller device helpers
*
@ -669,31 +668,11 @@ struct joycon_ctlr {
* These helpers are most useful early during the HID probe or in conjunction
* with the capability helpers below.
*/
static inline bool joycon_device_is_procon(struct joycon_ctlr *ctlr)
{
return ctlr->hdev->product == USB_DEVICE_ID_NINTENDO_PROCON;
}
static inline bool joycon_device_is_chrggrip(struct joycon_ctlr *ctlr)
{
return ctlr->hdev->product == USB_DEVICE_ID_NINTENDO_CHRGGRIP;
}
static inline bool joycon_device_is_snescon(struct joycon_ctlr *ctlr)
{
return ctlr->hdev->product == USB_DEVICE_ID_NINTENDO_SNESCON;
}
static inline bool joycon_device_is_gencon(struct joycon_ctlr *ctlr)
{
return ctlr->hdev->product == USB_DEVICE_ID_NINTENDO_GENCON;
}
static inline bool joycon_device_is_n64con(struct joycon_ctlr *ctlr)
{
return ctlr->hdev->product == USB_DEVICE_ID_NINTENDO_N64CON;
}
/*
* Controller type helpers
*