Commit 551117c5 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Jiri Kosina
Browse files

HID: i2c-hid: no longer need raw access to HID descriptor structure 



We can stop defining a union for HID descriptor data as we now only access
individual members of it by names and using proper types instead of
accessing by offset from the beginning of the data structure.

Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Tested-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 86fc3fd2

drivers/hid/i2c-hid/i2c-hid-core.c

+2 −5
Original line number Diff line number Diff line
@@ -98,10 +98,7 @@ struct i2c_hid_desc { 
struct i2c_hid {

	struct i2c_client	*client;	/* i2c client */

	struct hid_device	*hid;	/* pointer to corresponding HID dev */

	union {

		__u8 hdesc_buffer[sizeof(struct i2c_hid_desc)];

	struct i2c_hid_desc hdesc;		/* the HID Descriptor */

	};

	__le16			wHIDDescRegister; /* location of the i2c

						   * register of the HID

						   * descriptor. */
@@ -923,7 +920,7 @@ static int i2c_hid_fetch_hid_descriptor(struct i2c_hid *ihid) 
			"weird size of HID descriptor (%u)\n", dsize);

		return -ENODEV;

	}

	i2c_hid_dbg(ihid, "HID Descriptor: %*ph\n", dsize, ihid->hdesc_buffer);

	i2c_hid_dbg(ihid, "HID Descriptor: %*ph\n", dsize, &ihid->hdesc);

	return 0;

}