Commit 03f8dc1d authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Benjamin Tissoires
Browse files

HID: uclogic: constify fixed up report descriptor 



Now that the HID core can handle const report descriptors,
constify them where possible.

Signed-off-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Link: https://patch.msgid.link/20240828-hid-const-fixup-2-v1-14-663b9210eb69@weissschuh.net


Signed-off-by: default avatarBenjamin Tissoires <bentiss@kernel.org>
parent 24b3c515

drivers/hid/hid-uclogic-core.c

+1 −1
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ static const __u8 *uclogic_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
	struct uclogic_drvdata *drvdata = hid_get_drvdata(hdev);



	if (drvdata->desc_ptr != NULL) {

		rdesc = drvdata->desc_ptr;

		*rsize = drvdata->desc_size;

		return drvdata->desc_ptr;

	}

	return rdesc;

}

drivers/hid/hid-uclogic-params.c

+2 −2
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ void uclogic_params_cleanup(struct uclogic_params *params) 
 *	-ENOMEM, if failed to allocate memory.

 */

int uclogic_params_get_desc(const struct uclogic_params *params,

				__u8 **pdesc,

				const __u8 **pdesc,

				unsigned int *psize)

{

	int rc = -ENOMEM;
@@ -769,7 +769,7 @@ static void uclogic_params_init_invalid(struct uclogic_params *params) 
static int uclogic_params_init_with_opt_desc(struct uclogic_params *params,

					     struct hid_device *hdev,

					     unsigned int orig_desc_size,

					     __u8 *desc_ptr,

					     const __u8 *desc_ptr,

					     unsigned int desc_size)

{

	__u8 *desc_copy_ptr = NULL;

drivers/hid/hid-uclogic-params.h

+5 −5
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ struct uclogic_params_pen { 
	 * Pointer to report descriptor part describing the pen inputs.

	 * Allocated with kmalloc. NULL if the part is not specified.

	 */

	__u8 *desc_ptr;

	const __u8 *desc_ptr;

	/*

	 * Size of the report descriptor.

	 * Only valid, if "desc_ptr" is not NULL.
@@ -118,7 +118,7 @@ struct uclogic_params_frame { 
	 * Pointer to report descriptor part describing the frame inputs.

	 * Allocated with kmalloc. NULL if the part is not specified.

	 */

	__u8 *desc_ptr;

	const __u8 *desc_ptr;

	/*

	 * Size of the report descriptor.

	 * Only valid, if "desc_ptr" is not NULL.
@@ -212,7 +212,7 @@ struct uclogic_params { 
	 * allocated with kmalloc. NULL if no common part is needed.

	 * Only valid, if "invalid" is false.

	 */

	__u8 *desc_ptr;

	const __u8 *desc_ptr;

	/*

	 * Size of the common part of the replacement report descriptor.

	 * Only valid, if "desc_ptr" is valid and not NULL.
@@ -239,7 +239,7 @@ struct uclogic_drvdata { 
	/* Interface parameters */

	struct uclogic_params params;

	/* Pointer to the replacement report descriptor. NULL if none. */

	__u8 *desc_ptr;

	const __u8 *desc_ptr;

	/*

	 * Size of the replacement report descriptor.

	 * Only valid if desc_ptr is not NULL
@@ -261,7 +261,7 @@ extern int uclogic_params_init(struct uclogic_params *params, 


/* Get a replacement report descriptor for a tablet's interface. */

extern int uclogic_params_get_desc(const struct uclogic_params *params,

					__u8 **pdesc,

					const __u8 **pdesc,

					unsigned int *psize);



/* Free resources used by tablet interface's parameters */

drivers/hid/hid-uclogic-rdesc.c

+10 −10
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <kunit/visibility.h>



/* Fixed WP4030U report descriptor */

__u8 uclogic_rdesc_wp4030u_fixed_arr[] = {

const __u8 uclogic_rdesc_wp4030u_fixed_arr[] = {

	0x05, 0x0D,         /*  Usage Page (Digitizer),             */

	0x09, 0x01,         /*  Usage (Digitizer),                  */

	0xA1, 0x01,         /*  Collection (Application),           */
@@ -65,7 +65,7 @@ const size_t uclogic_rdesc_wp4030u_fixed_size = 
			sizeof(uclogic_rdesc_wp4030u_fixed_arr);



/* Fixed WP5540U report descriptor */

__u8 uclogic_rdesc_wp5540u_fixed_arr[] = {

const __u8 uclogic_rdesc_wp5540u_fixed_arr[] = {

	0x05, 0x0D,         /*  Usage Page (Digitizer),             */

	0x09, 0x01,         /*  Usage (Digitizer),                  */

	0xA1, 0x01,         /*  Collection (Application),           */
@@ -142,7 +142,7 @@ const size_t uclogic_rdesc_wp5540u_fixed_size = 
			sizeof(uclogic_rdesc_wp5540u_fixed_arr);



/* Fixed WP8060U report descriptor */

__u8 uclogic_rdesc_wp8060u_fixed_arr[] = {

const __u8 uclogic_rdesc_wp8060u_fixed_arr[] = {

	0x05, 0x0D,         /*  Usage Page (Digitizer),             */

	0x09, 0x01,         /*  Usage (Digitizer),                  */

	0xA1, 0x01,         /*  Collection (Application),           */
@@ -219,7 +219,7 @@ const size_t uclogic_rdesc_wp8060u_fixed_size = 
			sizeof(uclogic_rdesc_wp8060u_fixed_arr);



/* Fixed WP1062 report descriptor */

__u8 uclogic_rdesc_wp1062_fixed_arr[] = {

const __u8 uclogic_rdesc_wp1062_fixed_arr[] = {

	0x05, 0x0D,         /*  Usage Page (Digitizer),             */

	0x09, 0x01,         /*  Usage (Digitizer),                  */

	0xA1, 0x01,         /*  Collection (Application),           */
@@ -267,7 +267,7 @@ const size_t uclogic_rdesc_wp1062_fixed_size = 
			sizeof(uclogic_rdesc_wp1062_fixed_arr);



/* Fixed PF1209 report descriptor */

__u8 uclogic_rdesc_pf1209_fixed_arr[] = {

const __u8 uclogic_rdesc_pf1209_fixed_arr[] = {

	0x05, 0x0D,         /*  Usage Page (Digitizer),             */

	0x09, 0x01,         /*  Usage (Digitizer),                  */

	0xA1, 0x01,         /*  Collection (Application),           */
@@ -344,7 +344,7 @@ const size_t uclogic_rdesc_pf1209_fixed_size = 
			sizeof(uclogic_rdesc_pf1209_fixed_arr);



/* Fixed PID 0522 tablet report descriptor, interface 0 (stylus) */

__u8 uclogic_rdesc_twhl850_fixed0_arr[] = {

const __u8 uclogic_rdesc_twhl850_fixed0_arr[] = {

	0x05, 0x0D,         /*  Usage Page (Digitizer),             */

	0x09, 0x01,         /*  Usage (Digitizer),                  */

	0xA1, 0x01,         /*  Collection (Application),           */
@@ -390,7 +390,7 @@ const size_t uclogic_rdesc_twhl850_fixed0_size = 
			sizeof(uclogic_rdesc_twhl850_fixed0_arr);



/* Fixed PID 0522 tablet report descriptor, interface 1 (mouse) */

__u8 uclogic_rdesc_twhl850_fixed1_arr[] = {

const __u8 uclogic_rdesc_twhl850_fixed1_arr[] = {

	0x05, 0x01,         /*  Usage Page (Desktop),               */

	0x09, 0x02,         /*  Usage (Mouse),                      */

	0xA1, 0x01,         /*  Collection (Application),           */
@@ -430,7 +430,7 @@ const size_t uclogic_rdesc_twhl850_fixed1_size = 
			sizeof(uclogic_rdesc_twhl850_fixed1_arr);



/* Fixed PID 0522 tablet report descriptor, interface 2 (frame buttons) */

__u8 uclogic_rdesc_twhl850_fixed2_arr[] = {

const __u8 uclogic_rdesc_twhl850_fixed2_arr[] = {

	0x05, 0x01,         /*  Usage Page (Desktop),               */

	0x09, 0x06,         /*  Usage (Keyboard),                   */

	0xA1, 0x01,         /*  Collection (Application),           */
@@ -456,7 +456,7 @@ const size_t uclogic_rdesc_twhl850_fixed2_size = 
			sizeof(uclogic_rdesc_twhl850_fixed2_arr);



/* Fixed TWHA60 report descriptor, interface 0 (stylus) */

__u8 uclogic_rdesc_twha60_fixed0_arr[] = {

const __u8 uclogic_rdesc_twha60_fixed0_arr[] = {

	0x05, 0x0D,         /*  Usage Page (Digitizer),             */

	0x09, 0x01,         /*  Usage (Digitizer),                  */

	0xA1, 0x01,         /*  Collection (Application),           */
@@ -505,7 +505,7 @@ const size_t uclogic_rdesc_twha60_fixed0_size = 
			sizeof(uclogic_rdesc_twha60_fixed0_arr);



/* Fixed TWHA60 report descriptor, interface 1 (frame buttons) */

__u8 uclogic_rdesc_twha60_fixed1_arr[] = {

const __u8 uclogic_rdesc_twha60_fixed1_arr[] = {

	0x05, 0x01, /*  Usage Page (Desktop),       */

	0x09, 0x06, /*  Usage (Keyboard),           */

	0xA1, 0x01, /*  Collection (Application),   */

drivers/hid/hid-uclogic-rdesc.h

+10 −10
Original line number Diff line number Diff line
@@ -23,15 +23,15 @@ 
#define UCLOGIC_RDESC_WPXXXXU_ORIG_SIZE		212



/* Fixed WP4030U report descriptor */

extern __u8 uclogic_rdesc_wp4030u_fixed_arr[];

extern const __u8 uclogic_rdesc_wp4030u_fixed_arr[];

extern const size_t uclogic_rdesc_wp4030u_fixed_size;



/* Fixed WP5540U report descriptor */

extern __u8 uclogic_rdesc_wp5540u_fixed_arr[];

extern const __u8 uclogic_rdesc_wp5540u_fixed_arr[];

extern const size_t uclogic_rdesc_wp5540u_fixed_size;



/* Fixed WP8060U report descriptor */

extern __u8 uclogic_rdesc_wp8060u_fixed_arr[];

extern const __u8 uclogic_rdesc_wp8060u_fixed_arr[];

extern const size_t uclogic_rdesc_wp8060u_fixed_size;



/* Size of the original descriptor of the new WP5540U tablet */
@@ -41,14 +41,14 @@ extern const size_t uclogic_rdesc_wp8060u_fixed_size; 
#define UCLOGIC_RDESC_WP1062_ORIG_SIZE		254



/* Fixed WP1062 report descriptor */

extern __u8 uclogic_rdesc_wp1062_fixed_arr[];

extern const __u8 uclogic_rdesc_wp1062_fixed_arr[];

extern const size_t uclogic_rdesc_wp1062_fixed_size;



/* Size of the original descriptor of PF1209 tablet */

#define UCLOGIC_RDESC_PF1209_ORIG_SIZE		234



/* Fixed PF1209 report descriptor */

extern __u8 uclogic_rdesc_pf1209_fixed_arr[];

extern const __u8 uclogic_rdesc_pf1209_fixed_arr[];

extern const size_t uclogic_rdesc_pf1209_fixed_size;



/* Size of the original descriptors of TWHL850 tablet */
@@ -57,15 +57,15 @@ extern const size_t uclogic_rdesc_pf1209_fixed_size; 
#define UCLOGIC_RDESC_TWHL850_ORIG2_SIZE	92



/* Fixed PID 0522 tablet report descriptor, interface 0 (stylus) */

extern __u8 uclogic_rdesc_twhl850_fixed0_arr[];

extern const __u8 uclogic_rdesc_twhl850_fixed0_arr[];

extern const size_t uclogic_rdesc_twhl850_fixed0_size;



/* Fixed PID 0522 tablet report descriptor, interface 1 (mouse) */

extern __u8 uclogic_rdesc_twhl850_fixed1_arr[];

extern const __u8 uclogic_rdesc_twhl850_fixed1_arr[];

extern const size_t uclogic_rdesc_twhl850_fixed1_size;



/* Fixed PID 0522 tablet report descriptor, interface 2 (frame buttons) */

extern __u8 uclogic_rdesc_twhl850_fixed2_arr[];

extern const __u8 uclogic_rdesc_twhl850_fixed2_arr[];

extern const size_t uclogic_rdesc_twhl850_fixed2_size;



/* Size of the original descriptors of TWHA60 tablet */
@@ -73,11 +73,11 @@ extern const size_t uclogic_rdesc_twhl850_fixed2_size; 
#define UCLOGIC_RDESC_TWHA60_ORIG1_SIZE		139



/* Fixed TWHA60 report descriptor, interface 0 (stylus) */

extern __u8 uclogic_rdesc_twha60_fixed0_arr[];

extern const __u8 uclogic_rdesc_twha60_fixed0_arr[];

extern const size_t uclogic_rdesc_twha60_fixed0_size;



/* Fixed TWHA60 report descriptor, interface 1 (frame buttons) */

extern __u8 uclogic_rdesc_twha60_fixed1_arr[];

extern const __u8 uclogic_rdesc_twha60_fixed1_arr[];

extern const size_t uclogic_rdesc_twha60_fixed1_size;



/* Report descriptor template placeholder head */