Commit 2fe90223 authored by Benjamin Tissoires's avatar Benjamin Tissoires

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

Cleanup unused functions in hid-nintendo by Jiapeng Chong
parents d0dcd195 09bae587
...@@ -658,7 +658,6 @@ struct joycon_ctlr { ...@@ -658,7 +658,6 @@ struct joycon_ctlr {
(ctlr->ctlr_type == JOYCON_CTLR_TYPE_JCR || \ (ctlr->ctlr_type == JOYCON_CTLR_TYPE_JCR || \
ctlr->ctlr_type == JOYCON_CTLR_TYPE_PRO) ctlr->ctlr_type == JOYCON_CTLR_TYPE_PRO)
/* /*
* Controller device helpers * Controller device helpers
* *
...@@ -669,31 +668,11 @@ struct joycon_ctlr { ...@@ -669,31 +668,11 @@ struct joycon_ctlr {
* These helpers are most useful early during the HID probe or in conjunction * These helpers are most useful early during the HID probe or in conjunction
* with the capability helpers below. * 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) static inline bool joycon_device_is_chrggrip(struct joycon_ctlr *ctlr)
{ {
return ctlr->hdev->product == USB_DEVICE_ID_NINTENDO_CHRGGRIP; 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 * Controller type helpers
* *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment