From: "Michal Malý" <madcatxster@devoid-pointer.net>
To: jkosina@suse.cz
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
elias.vds@gmail.com, simon@mungewell.org,
"Michal Malý" <madcatxster@devoid-pointer.net>
Subject: [PATCH 09/12] HID: hid-lg4ff: Constify those members of lg4ff_device_entry struct whose value is not supposed to change.
Date: Sat, 21 Mar 2015 12:47:39 +0100 [thread overview]
Message-ID: <1426938462-884-10-git-send-email-madcatxster@devoid-pointer.net> (raw)
In-Reply-To: <1426938462-884-1-git-send-email-madcatxster@devoid-pointer.net>
Prevent accidental modifications of read-only members of the lg4ff_device_entry
struct.
Signed-off-by: Michal Malý <madcatxster@devoid-pointer.net>
---
drivers/hid/hid-lg4ff.c | 54 +++++++++++++++++++++++++++++++++++--------------
1 file changed, 39 insertions(+), 15 deletions(-)
diff --git a/drivers/hid/hid-lg4ff.c b/drivers/hid/hid-lg4ff.c
index fd6f140..ad959e2 100644
--- a/drivers/hid/hid-lg4ff.c
+++ b/drivers/hid/hid-lg4ff.c
@@ -72,18 +72,18 @@ static void lg4ff_set_range_dfp(struct hid_device *hid, u16 range);
static void lg4ff_set_range_g25(struct hid_device *hid, u16 range);
struct lg4ff_wheel_data {
- u32 product_id;
+ const u32 product_id;
u16 range;
- u16 min_range;
- u16 max_range;
+ const u16 min_range;
+ const u16 max_range;
#ifdef CONFIG_LEDS_CLASS
u8 led_state;
struct led_classdev *led[5];
#endif
- u32 alternate_modes;
- const char *real_tag;
- const char *real_name;
- u16 real_product_id;
+ const u32 alternate_modes;
+ const char * const real_tag;
+ const char * const real_name;
+ const u16 real_product_id;
void (*set_range)(struct hid_device *hid, u16 range);
};
@@ -300,6 +300,34 @@ int lg4ff_adjust_input_event(struct hid_device *hid, struct hid_field *field,
}
}
+static void lg4ff_init_wheel_data(struct lg4ff_wheel_data * const wdata, const struct lg4ff_wheel *wheel,
+ const struct lg4ff_multimode_wheel *mmode_wheel,
+ const u16 real_product_id)
+{
+ u32 alternate_modes = 0;
+ const char *real_tag = NULL;
+ const char *real_name = NULL;
+
+ if (mmode_wheel) {
+ alternate_modes = mmode_wheel->alternate_modes;
+ real_tag = mmode_wheel->real_tag;
+ real_name = mmode_wheel->real_name;
+ }
+
+ {
+ struct lg4ff_wheel_data t_wdata = { .product_id = wheel->product_id,
+ .real_product_id = real_product_id,
+ .min_range = wheel->min_range,
+ .max_range = wheel->max_range,
+ .set_range = wheel->set_range,
+ .alternate_modes = alternate_modes,
+ .real_tag = real_tag,
+ .real_name = real_name };
+
+ memcpy(wdata, &t_wdata, sizeof(t_wdata));
+ }
+}
+
static int lg4ff_play(struct input_dev *dev, void *data, struct ff_effect *effect)
{
struct hid_device *hid = input_get_drvdata(dev);
@@ -1101,6 +1129,7 @@ int lg4ff_init(struct hid_device *hid)
struct hid_report *report = list_entry(report_list->next, struct hid_report, list);
const struct usb_device_descriptor *udesc = &(hid_to_usb_dev(hid)->descriptor);
const u16 bcdDevice = le16_to_cpu(udesc->bcdDevice);
+ const struct lg4ff_multimode_wheel *mmode_wheel = NULL;
struct lg4ff_device_entry *entry;
struct lg_drv_data *drv_data;
int error, i, j;
@@ -1174,17 +1203,12 @@ int lg4ff_init(struct hid_device *hid)
if (error)
goto err_init;
- entry->wdata.product_id = lg4ff_devices[i].product_id;
- entry->wdata.real_product_id = real_product_id;
- entry->wdata.min_range = lg4ff_devices[i].min_range;
- entry->wdata.max_range = lg4ff_devices[i].max_range;
- entry->wdata.set_range = lg4ff_devices[i].set_range;
+ /* Initialize device properties */
if (mmode_ret == LG4FF_MMODE_IS_MULTIMODE) {
BUG_ON(mmode_idx == -1);
- entry->wdata.alternate_modes = lg4ff_multimode_wheels[mmode_idx].alternate_modes;
- entry->wdata.real_tag = lg4ff_multimode_wheels[mmode_idx].real_tag;
- entry->wdata.real_name = lg4ff_multimode_wheels[mmode_idx].real_name;
+ mmode_wheel = &lg4ff_multimode_wheels[mmode_idx];
}
+ lg4ff_init_wheel_data(&entry->wdata, &lg4ff_devices[i], mmode_wheel, real_product_id);
/* Check if autocentering is available and
* set the centering force to zero by default */
--
2.3.3
next prev parent reply other threads:[~2015-03-21 11:47 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-21 11:47 [PATCH 00/12] HID: hid-lg, hid-lg4ff: Mostly cleanup patches Michal Malý
2015-03-21 11:47 ` [PATCH 01/12] HID: hid-lg4ff: (Cleanup) Remove double underscore prefix from numeric types Michal Malý
2015-03-21 11:47 ` [PATCH 02/12] HID: hid-lg4ff: (Cleanup) Remove "hid_" prefix from some functions names Michal Malý
2015-03-21 11:47 ` [PATCH 03/12] HID: hid-lg4ff: (Cleanup) Replace DEVICE_ATTR_RW with DEVICE_ATTR to have all internal functions prefixed with "lg4ff_" Michal Malý
2015-03-21 11:47 ` [PATCH 04/12] HID: hid-lg4ff: (Cleanup) Remove unused variable from the "lg4ff_device_entry" struct Michal Malý
2015-03-21 11:47 ` [PATCH 05/12] HID: hid-lg4ff: Update a warning message for a case where device is incorrectly flagged to be handled by hid-lg4ff in hid-lg Michal Malý
2015-03-31 14:38 ` Jiri Kosina
2015-03-21 11:47 ` [PATCH 06/12] HID: hid-lg: Check return values from lg[N]ff_init() Michal Malý
2015-03-21 11:47 ` [PATCH 07/12] HID: hid-lg4ff: Protect concurrent access to the output HID report values with a spinlock Michal Malý
2015-03-31 14:44 ` Jiri Kosina
2015-03-21 11:47 ` [PATCH 08/12] HID: hid-lg4ff: Store pointer to the output HID report struct in the device entry struct Michal Malý
2015-03-21 11:47 ` Michal Malý [this message]
2015-03-21 11:47 ` [PATCH 10/12] HID: hid-lg4ff: Allow the driver to continue without sysfs interface Michal Malý
2015-03-21 11:47 ` [PATCH 11/12] HID: hid-lg4ff: Update respective sysfs interface documentation Michal Malý
2015-03-21 11:47 ` [PATCH 12/12] HID: hid-lg: Only one of LG_FF flags can be set for a given device Michal Malý
2015-03-29 9:01 ` [PATCH 00/12] HID: hid-lg, hid-lg4ff: Mostly cleanup patches Elias Vanderstuyft
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1426938462-884-10-git-send-email-madcatxster@devoid-pointer.net \
--to=madcatxster@devoid-pointer.net \
--cc=elias.vds@gmail.com \
--cc=jkosina@suse.cz \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=simon@mungewell.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).