From: =?UTF-8?q?Michal=20Mal=C3=BD?= Subject: [PATCH v2 11/15] HID: hid-lg4ff: Store pointer to the output HID report struct in the device entry struct. Date: Wed, 8 Apr 2015 22:56:49 +0200 Message-ID: <1428526613-24239-12-git-send-email-madcatxster@devoid-pointer.net> References: <1428526613-24239-1-git-send-email-madcatxster@devoid-pointer.net> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from devoid-pointer.net ([31.31.77.140]:33001 "EHLO smtp.devoid-pointer.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754739AbbDHU52 (ORCPT ); Wed, 8 Apr 2015 16:57:28 -0400 In-Reply-To: <1428526613-24239-1-git-send-email-madcatxster@devoid-pointer.net> Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: jkosina@suse.cz Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.or, elias.vds@gmail.com, simon@mungewell.org, =?UTF-8?q?Michal=20Mal=C3=BD?= Store pointer to the output HID report struct in the device entry struc= t. This eliminates the need to look the HID report struct up every time it= is needed. Signed-off-by: Michal Mal=C3=BD --- drivers/hid/hid-lg4ff.c | 67 +++++++++++++++++++++++------------------= -------- 1 file changed, 32 insertions(+), 35 deletions(-) diff --git a/drivers/hid/hid-lg4ff.c b/drivers/hid/hid-lg4ff.c index f7f4eb6..d27b210 100644 --- a/drivers/hid/hid-lg4ff.c +++ b/drivers/hid/hid-lg4ff.c @@ -90,6 +90,7 @@ struct lg4ff_wheel_data { =20 struct lg4ff_device_entry { spinlock_t report_lock; /* Protect output HID report */ + struct hid_report *report; struct lg4ff_wheel_data wdata; }; =20 @@ -302,12 +303,10 @@ int lg4ff_adjust_input_event(struct hid_device *h= id, struct hid_field *field, static int lg4ff_play(struct input_dev *dev, void *data, struct ff_eff= ect *effect) { struct hid_device *hid =3D input_get_drvdata(dev); - struct list_head *report_list =3D &hid->report_enum[HID_OUTPUT_REPORT= ].report_list; - struct hid_report *report =3D list_entry(report_list->next, struct hi= d_report, list); struct lg4ff_device_entry *entry; struct lg_drv_data *drv_data; unsigned long flags; - s32 *value =3D report->field[0]->value; + s32 *value; int x; =20 drv_data =3D hid_get_drvdata(hid); @@ -321,6 +320,7 @@ static int lg4ff_play(struct input_dev *dev, void *= data, struct ff_effect *effec hid_err(hid, "Device properties not found!\n"); return -EINVAL; } + value =3D entry->report->field[0]->value; =20 #define CLAMP(x) do { if (x < 0) x =3D 0; else if (x > 0xff) x =3D 0xf= f; } while (0) =20 @@ -340,7 +340,7 @@ static int lg4ff_play(struct input_dev *dev, void *= data, struct ff_effect *effec value[5] =3D 0x00; value[6] =3D 0x00; =20 - hid_hw_request(hid, report, HID_REQ_SET_REPORT); + hid_hw_request(hid, entry->report, HID_REQ_SET_REPORT); spin_unlock_irqrestore(&entry->report_lock, flags); return 0; } @@ -353,7 +353,7 @@ static int lg4ff_play(struct input_dev *dev, void *= data, struct ff_effect *effec value[5] =3D 0x00; value[6] =3D 0x00; =20 - hid_hw_request(hid, report, HID_REQ_SET_REPORT); + hid_hw_request(hid, entry->report, HID_REQ_SET_REPORT); spin_unlock_irqrestore(&entry->report_lock, flags); break; } @@ -384,6 +384,7 @@ static void lg4ff_set_autocenter_default(struct inp= ut_dev *dev, u16 magnitude) hid_err(hid, "Device properties not found!\n"); return; } + value =3D entry->report->field[0]->value; =20 /* De-activate Auto-Center */ spin_lock_irqsave(&entry->report_lock, flags); @@ -396,7 +397,7 @@ static void lg4ff_set_autocenter_default(struct inp= ut_dev *dev, u16 magnitude) value[5] =3D 0x00; value[6] =3D 0x00; =20 - hid_hw_request(hid, report, HID_REQ_SET_REPORT); + hid_hw_request(hid, entry->report, HID_REQ_SET_REPORT); spin_unlock_irqrestore(&entry->report_lock, flags); return; } @@ -427,7 +428,7 @@ static void lg4ff_set_autocenter_default(struct inp= ut_dev *dev, u16 magnitude) value[5] =3D 0x00; value[6] =3D 0x00; =20 - hid_hw_request(hid, report, HID_REQ_SET_REPORT); + hid_hw_request(hid, entry->report, HID_REQ_SET_REPORT); =20 /* Activate Auto-Center */ value[0] =3D 0x14; @@ -438,7 +439,7 @@ static void lg4ff_set_autocenter_default(struct inp= ut_dev *dev, u16 magnitude) value[5] =3D 0x00; value[6] =3D 0x00; =20 - hid_hw_request(hid, report, HID_REQ_SET_REPORT); + hid_hw_request(hid, entry->report, HID_REQ_SET_REPORT); spin_unlock_irqrestore(&entry->report_lock, flags); } =20 @@ -446,12 +447,10 @@ static void lg4ff_set_autocenter_default(struct i= nput_dev *dev, u16 magnitude) static void lg4ff_set_autocenter_ffex(struct input_dev *dev, u16 magni= tude) { struct hid_device *hid =3D input_get_drvdata(dev); - struct list_head *report_list =3D &hid->report_enum[HID_OUTPUT_REPORT= ].report_list; - struct hid_report *report =3D list_entry(report_list->next, struct hi= d_report, list); struct lg4ff_device_entry *entry; struct lg_drv_data *drv_data; unsigned long flags; - s32 *value =3D report->field[0]->value; + s32 *value; magnitude =3D magnitude * 90 / 65535; =20 drv_data =3D hid_get_drvdata(hid); @@ -465,6 +464,7 @@ static void lg4ff_set_autocenter_ffex(struct input_= dev *dev, u16 magnitude) hid_err(hid, "Device properties not found!\n"); return; } + value =3D entry->report->field[0]->value; =20 spin_lock_irqsave(&entry->report_lock, flags); value[0] =3D 0xfe; @@ -475,19 +475,17 @@ static void lg4ff_set_autocenter_ffex(struct inpu= t_dev *dev, u16 magnitude) value[5] =3D 0x00; value[6] =3D 0x00; =20 - hid_hw_request(hid, report, HID_REQ_SET_REPORT); + hid_hw_request(hid, entry->report, HID_REQ_SET_REPORT); spin_unlock_irqrestore(&entry->report_lock, flags); } =20 /* Sends command to set range compatible with G25/G27/Driving Force GT= */ static void lg4ff_set_range_g25(struct hid_device *hid, u16 range) { - struct list_head *report_list =3D &hid->report_enum[HID_OUTPUT_REPORT= ].report_list; - struct hid_report *report =3D list_entry(report_list->next, struct hi= d_report, list); struct lg4ff_device_entry *entry; struct lg_drv_data *drv_data; unsigned long flags; - s32 *value =3D report->field[0]->value; + s32 *value; =20 drv_data =3D hid_get_drvdata(hid); if (!drv_data) { @@ -500,7 +498,7 @@ static void lg4ff_set_range_g25(struct hid_device *= hid, u16 range) hid_err(hid, "Device properties not found!\n"); return; } - + value =3D entry->report->field[0]->value; dbg_hid("G25/G27/DFGT: setting range to %u\n", range); =20 spin_lock_irqsave(&entry->report_lock, flags); @@ -512,20 +510,18 @@ static void lg4ff_set_range_g25(struct hid_device= *hid, u16 range) value[5] =3D 0x00; value[6] =3D 0x00; =20 - hid_hw_request(hid, report, HID_REQ_SET_REPORT); + hid_hw_request(hid, entry->report, HID_REQ_SET_REPORT); spin_unlock_irqrestore(&entry->report_lock, flags); } =20 /* Sends commands to set range compatible with Driving Force Pro wheel= */ static void lg4ff_set_range_dfp(struct hid_device *hid, u16 range) { - struct list_head *report_list =3D &hid->report_enum[HID_OUTPUT_REPORT= ].report_list; - struct hid_report *report =3D list_entry(report_list->next, struct hi= d_report, list); - int start_left, start_right, full_range; struct lg4ff_device_entry *entry; struct lg_drv_data *drv_data; unsigned long flags; - s32 *value =3D report->field[0]->value; + int start_left, start_right, full_range; + s32 *value; =20 drv_data =3D hid_get_drvdata(hid); if (!drv_data) { @@ -538,7 +534,7 @@ static void lg4ff_set_range_dfp(struct hid_device *= hid, u16 range) hid_err(hid, "Device properties not found!\n"); return; } - + value =3D entry->report->field[0]->value; dbg_hid("Driving Force Pro: setting range to %u\n", range); =20 /* Prepare "coarse" limit command */ @@ -552,13 +548,13 @@ static void lg4ff_set_range_dfp(struct hid_device= *hid, u16 range) value[6] =3D 0x00; =20 if (range > 200) { - report->field[0]->value[1] =3D 0x03; + value[1] =3D 0x03; full_range =3D 900; } else { - report->field[0]->value[1] =3D 0x02; + value[1] =3D 0x02; full_range =3D 200; } - hid_hw_request(hid, report, HID_REQ_SET_REPORT); + hid_hw_request(hid, entry->report, HID_REQ_SET_REPORT); =20 /* Prepare "fine" limit command */ value[0] =3D 0x81; @@ -570,7 +566,7 @@ static void lg4ff_set_range_dfp(struct hid_device *= hid, u16 range) value[6] =3D 0x00; =20 if (range =3D=3D 200 || range =3D=3D 900) { /* Do not apply any fine = limit */ - hid_hw_request(hid, report, HID_REQ_SET_REPORT); + hid_hw_request(hid, entry->report, HID_REQ_SET_REPORT); spin_unlock_irqrestore(&entry->report_lock, flags); return; } @@ -585,7 +581,7 @@ static void lg4ff_set_range_dfp(struct hid_device *= hid, u16 range) value[5] =3D (start_right & 0xe) << 4 | (start_left & 0xe); value[6] =3D 0xff; =20 - hid_hw_request(hid, report, HID_REQ_SET_REPORT); + hid_hw_request(hid, entry->report, HID_REQ_SET_REPORT); spin_unlock_irqrestore(&entry->report_lock, flags); } =20 @@ -648,12 +644,10 @@ static const struct lg4ff_compat_mode_switch *lg4= ff_get_mode_switch_command(cons =20 static int lg4ff_switch_compatibility_mode(struct hid_device *hid, con= st struct lg4ff_compat_mode_switch *s) { - struct list_head *report_list =3D &hid->report_enum[HID_OUTPUT_REPORT= ].report_list; - struct hid_report *report =3D list_entry(report_list->next, struct hi= d_report, list); struct lg4ff_device_entry *entry; struct lg_drv_data *drv_data; unsigned long flags; - s32 *value =3D report->field[0]->value; + s32 *value; u8 i; =20 drv_data =3D hid_get_drvdata(hid); @@ -667,6 +661,7 @@ static int lg4ff_switch_compatibility_mode(struct h= id_device *hid, const struct hid_err(hid, "Device properties not found!\n"); return -EINVAL; } + value =3D entry->report->field[0]->value; =20 spin_lock_irqsave(&entry->report_lock, flags); for (i =3D 0; i < s->cmd_count; i++) { @@ -675,7 +670,7 @@ static int lg4ff_switch_compatibility_mode(struct h= id_device *hid, const struct for (j =3D 0; j < 7; j++) value[j] =3D s->cmd[j + (7*i)]; =20 - hid_hw_request(hid, report, HID_REQ_SET_REPORT); + hid_hw_request(hid, entry->report, HID_REQ_SET_REPORT); } spin_unlock_irqrestore(&entry->report_lock, flags); hid_hw_wait(hid); @@ -916,12 +911,10 @@ static DEVICE_ATTR(real_id, S_IRUGO, lg4ff_real_i= d_show, lg4ff_real_id_store); #ifdef CONFIG_LEDS_CLASS static void lg4ff_set_leds(struct hid_device *hid, u8 leds) { - struct list_head *report_list =3D &hid->report_enum[HID_OUTPUT_REPORT= ].report_list; - struct hid_report *report =3D list_entry(report_list->next, struct hi= d_report, list); struct lg_drv_data *drv_data; struct lg4ff_device_entry *entry; unsigned long flags; - s32 *value =3D report->field[0]->value; + s32 *value; =20 drv_data =3D hid_get_drvdata(hid); if (!drv_data) { @@ -934,6 +927,7 @@ static void lg4ff_set_leds(struct hid_device *hid, = u8 leds) hid_err(hid, "Device properties not found!\n"); return; } + value =3D entry->report->field[0]->value; =20 spin_lock_irqsave(&entry->report_lock, flags); value[0] =3D 0xf8; @@ -943,7 +937,7 @@ static void lg4ff_set_leds(struct hid_device *hid, = u8 leds) value[4] =3D 0x00; value[5] =3D 0x00; value[6] =3D 0x00; - hid_hw_request(hid, report, HID_REQ_SET_REPORT); + hid_hw_request(hid, entry->report, HID_REQ_SET_REPORT); spin_unlock_irqrestore(&entry->report_lock, flags); } =20 @@ -1104,6 +1098,8 @@ int lg4ff_init(struct hid_device *hid) { struct hid_input *hidinput =3D list_entry(hid->inputs.next, struct hi= d_input, list); struct input_dev *dev =3D hidinput->input; + struct list_head *report_list =3D &hid->report_enum[HID_OUTPUT_REPORT= ].report_list; + struct hid_report *report =3D list_entry(report_list->next, struct hi= d_report, list); const struct usb_device_descriptor *udesc =3D &(hid_to_usb_dev(hid)->= descriptor); const u16 bcdDevice =3D le16_to_cpu(udesc->bcdDevice); struct lg4ff_device_entry *entry; @@ -1125,6 +1121,7 @@ int lg4ff_init(struct hid_device *hid) if (!entry) return -ENOMEM; spin_lock_init(&entry->report_lock); + entry->report =3D report; drv_data->device_props =3D entry; =20 /* Check if a multimode wheel has been connected and --=20 2.3.5 -- To unsubscribe from this list: send the line "unsubscribe linux-input" = in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html