Commit 0b1b0c11 authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Benjamin Tissoires
Browse files

HID: bpf: drop unneeded casts discarding const 



In commit 33c0fb85 ("HID: bpf: make part of struct hid_device writable")
the const qualifier was dropped from struct hid_bpf_ctx::hid.
The casts are now unnecessary.

Signed-off-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Link: https://patch.msgid.link/20241127-hid-bpf-cast-v1-1-f26424960e84@weissschuh.net


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

drivers/hid/bpf/hid_bpf_dispatch.c

+3 −12
Original line number Diff line number Diff line
@@ -352,7 +352,6 @@ __hid_bpf_hw_check_params(struct hid_bpf_ctx *ctx, __u8 *buf, size_t *buf__sz, 
{

	struct hid_report_enum *report_enum;

	struct hid_report *report;

	struct hid_device *hdev;

	u32 report_len;



	/* check arguments */
@@ -371,9 +370,7 @@ __hid_bpf_hw_check_params(struct hid_bpf_ctx *ctx, __u8 *buf, size_t *buf__sz, 
	if (*buf__sz < 1)

		return -EINVAL;



	hdev = (struct hid_device *)ctx->hid; /* discard const */



	report_enum = hdev->report_enum + rtype;

	report_enum = ctx->hid->report_enum + rtype;

	report = hid_ops->hid_get_report(report_enum, buf);

	if (!report)

		return -EINVAL;
@@ -402,7 +399,6 @@ hid_bpf_hw_request(struct hid_bpf_ctx *ctx, __u8 *buf, size_t buf__sz, 
		   enum hid_report_type rtype, enum hid_class_request reqtype)

{

	struct hid_bpf_ctx_kern *ctx_kern;

	struct hid_device *hdev;

	size_t size = buf__sz;

	u8 *dma_data;

	int ret;
@@ -429,13 +425,11 @@ hid_bpf_hw_request(struct hid_bpf_ctx *ctx, __u8 *buf, size_t buf__sz, 
		return -EINVAL;

	}



	hdev = (struct hid_device *)ctx->hid; /* discard const */



	dma_data = kmemdup(buf, size, GFP_KERNEL);

	if (!dma_data)

		return -ENOMEM;



	ret = hid_ops->hid_hw_raw_request(hdev,

	ret = hid_ops->hid_hw_raw_request(ctx->hid,

					      dma_data[0],

					      dma_data,

					      size,
@@ -464,7 +458,6 @@ __bpf_kfunc int 
hid_bpf_hw_output_report(struct hid_bpf_ctx *ctx, __u8 *buf, size_t buf__sz)

{

	struct hid_bpf_ctx_kern *ctx_kern;

	struct hid_device *hdev;

	size_t size = buf__sz;

	u8 *dma_data;

	int ret;
@@ -478,13 +471,11 @@ hid_bpf_hw_output_report(struct hid_bpf_ctx *ctx, __u8 *buf, size_t buf__sz) 
	if (ret)

		return ret;



	hdev = (struct hid_device *)ctx->hid; /* discard const */



	dma_data = kmemdup(buf, size, GFP_KERNEL);

	if (!dma_data)

		return -ENOMEM;



	ret = hid_ops->hid_hw_output_report(hdev, dma_data, size, (u64)(long)ctx, true);

	ret = hid_ops->hid_hw_output_report(ctx->hid, dma_data, size, (u64)(long)ctx, true);



	kfree(dma_data);

	return ret;