Commit f65a0b1f authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

HID: do not inline some hid_hw_ functions 



We don't gain much by having them as inline, and it
actually prevents us to attach a probe to those helpers.

Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20211202095334.14399-5-benjamin.tissoires@redhat.com
parent 9e356208

drivers/hid/hid-core.c

+64 −0
Original line number Diff line number Diff line
@@ -2126,6 +2126,70 @@ void hid_hw_close(struct hid_device *hdev) 
}

EXPORT_SYMBOL_GPL(hid_hw_close);



/**

 * hid_hw_request - send report request to device

 *

 * @hdev: hid device

 * @report: report to send

 * @reqtype: hid request type

 */

void hid_hw_request(struct hid_device *hdev,

		    struct hid_report *report, int reqtype)

{

	if (hdev->ll_driver->request)

		return hdev->ll_driver->request(hdev, report, reqtype);



	__hid_request(hdev, report, reqtype);

}

EXPORT_SYMBOL_GPL(hid_hw_request);



/**

 * hid_hw_raw_request - send report request to device

 *

 * @hdev: hid device

 * @reportnum: report ID

 * @buf: in/out data to transfer

 * @len: length of buf

 * @rtype: HID report type

 * @reqtype: HID_REQ_GET_REPORT or HID_REQ_SET_REPORT

 *

 * Return: count of data transferred, negative if error

 *

 * Same behavior as hid_hw_request, but with raw buffers instead.

 */

int hid_hw_raw_request(struct hid_device *hdev,

		       unsigned char reportnum, __u8 *buf,

		       size_t len, unsigned char rtype, int reqtype)

{

	if (len < 1 || len > HID_MAX_BUFFER_SIZE || !buf)

		return -EINVAL;



	return hdev->ll_driver->raw_request(hdev, reportnum, buf, len,

					    rtype, reqtype);

}

EXPORT_SYMBOL_GPL(hid_hw_raw_request);



/**

 * hid_hw_output_report - send output report to device

 *

 * @hdev: hid device

 * @buf: raw data to transfer

 * @len: length of buf

 *

 * Return: count of data transferred, negative if error

 */

int hid_hw_output_report(struct hid_device *hdev, __u8 *buf, size_t len)

{

	if (len < 1 || len > HID_MAX_BUFFER_SIZE || !buf)

		return -EINVAL;



	if (hdev->ll_driver->output_report)

		return hdev->ll_driver->output_report(hdev, buf, len);



	return -ENOSYS;

}

EXPORT_SYMBOL_GPL(hid_hw_output_report);



#ifdef CONFIG_PM

int hid_driver_suspend(struct hid_device *hdev, pm_message_t state)

{

include/linux/hid.h

+6 −62
Original line number Diff line number Diff line
@@ -1066,6 +1066,12 @@ int __must_check hid_hw_start(struct hid_device *hdev, 
void hid_hw_stop(struct hid_device *hdev);

int __must_check hid_hw_open(struct hid_device *hdev);

void hid_hw_close(struct hid_device *hdev);

void hid_hw_request(struct hid_device *hdev,

		    struct hid_report *report, int reqtype);

int hid_hw_raw_request(struct hid_device *hdev,

		       unsigned char reportnum, __u8 *buf,

		       size_t len, unsigned char rtype, int reqtype);

int hid_hw_output_report(struct hid_device *hdev, __u8 *buf, size_t len);



/**

 * hid_hw_power - requests underlying HW to go into given power mode
@@ -1083,68 +1089,6 @@ static inline int hid_hw_power(struct hid_device *hdev, int level) 
}





/**

 * hid_hw_request - send report request to device

 *

 * @hdev: hid device

 * @report: report to send

 * @reqtype: hid request type

 */

static inline void hid_hw_request(struct hid_device *hdev,

				  struct hid_report *report, int reqtype)

{

	if (hdev->ll_driver->request)

		return hdev->ll_driver->request(hdev, report, reqtype);



	__hid_request(hdev, report, reqtype);

}



/**

 * hid_hw_raw_request - send report request to device

 *

 * @hdev: hid device

 * @reportnum: report ID

 * @buf: in/out data to transfer

 * @len: length of buf

 * @rtype: HID report type

 * @reqtype: HID_REQ_GET_REPORT or HID_REQ_SET_REPORT

 *

 * Return: count of data transferred, negative if error

 *

 * Same behavior as hid_hw_request, but with raw buffers instead.

 */

static inline int hid_hw_raw_request(struct hid_device *hdev,

				  unsigned char reportnum, __u8 *buf,

				  size_t len, unsigned char rtype, int reqtype)

{

	if (len < 1 || len > HID_MAX_BUFFER_SIZE || !buf)

		return -EINVAL;



	return hdev->ll_driver->raw_request(hdev, reportnum, buf, len,

						    rtype, reqtype);

}



/**

 * hid_hw_output_report - send output report to device

 *

 * @hdev: hid device

 * @buf: raw data to transfer

 * @len: length of buf

 *

 * Return: count of data transferred, negative if error

 */

static inline int hid_hw_output_report(struct hid_device *hdev, __u8 *buf,

					size_t len)

{

	if (len < 1 || len > HID_MAX_BUFFER_SIZE || !buf)

		return -EINVAL;



	if (hdev->ll_driver->output_report)

		return hdev->ll_driver->output_report(hdev, buf, len);



	return -ENOSYS;

}



/**

 * hid_hw_idle - send idle request to device

 *