Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aca22a35 authored by Hans de Goede's avatar Hans de Goede Committed by Benjamin Tissoires
Browse files

HID: logitech-dj: replace dev_err calls with hid_err calls 



Use hid_err consistently everywhere.

While at it also tweak some of the messages for clarity, to
consistently have a space after a ':' and in some cases to fit
within 80 chars.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
parent 1f944ac6

drivers/hid/hid-logitech-dj.c

+18 −27
Original line number Diff line number Diff line
@@ -620,8 +620,7 @@ static void logi_dj_recv_add_djhid_device(struct dj_receiver_dev *djrcv_dev, 


	dj_hiddev = hid_allocate_device();

	if (IS_ERR(dj_hiddev)) {

		dev_err(&djrcv_hdev->dev, "%s: hid_allocate_device failed\n",

			__func__);

		hid_err(djrcv_hdev, "%s: hid_allocate_dev failed\n", __func__);

		return;

	}
@@ -648,8 +647,7 @@ static void logi_dj_recv_add_djhid_device(struct dj_receiver_dev *djrcv_dev, 
	dj_dev = kzalloc(sizeof(struct dj_device), GFP_KERNEL);



	if (!dj_dev) {

		dev_err(&djrcv_hdev->dev, "%s: failed allocating dj_device\n",

			__func__);

		hid_err(djrcv_hdev, "%s: failed allocating dj_dev\n", __func__);

		goto dj_device_allocate_fail;

	}
@@ -664,8 +662,7 @@ static void logi_dj_recv_add_djhid_device(struct dj_receiver_dev *djrcv_dev, 
	spin_unlock_irqrestore(&djrcv_dev->lock, flags);



	if (hid_add_device(dj_hiddev)) {

		dev_err(&djrcv_hdev->dev, "%s: failed adding dj_device\n",

			__func__);

		hid_err(djrcv_hdev, "%s: failed adding dj_device\n", __func__);

		goto hid_add_device_fail;

	}
@@ -1018,7 +1015,7 @@ static int logi_dj_recv_send_report(struct dj_receiver_dev *djrcv_dev, 
	report = output_report_enum->report_id_hash[REPORT_ID_DJ_SHORT];



	if (!report) {

		dev_err(&hdev->dev, "%s: unable to find dj report\n", __func__);

		hid_err(hdev, "%s: unable to find dj report\n", __func__);

		return -ENODEV;

	}
@@ -1346,7 +1343,7 @@ static int logi_dj_dj_event(struct hid_device *hdev, 
		 * so ignore those reports too.

		 */

		if (dj_report->device_index != DJ_RECEIVER_INDEX)

			dev_err(&hdev->dev, "%s: invalid device index:%d\n",

			hid_err(hdev, "%s: invalid device index:%d\n",

				__func__, dj_report->device_index);

		return false;

	}
@@ -1418,8 +1415,8 @@ static int logi_dj_hidpp_event(struct hid_device *hdev, 
		 * This driver can ignore safely the receiver notifications,

		 * so ignore those reports too.

		 */

		dev_err(&hdev->dev, "%s: invalid device index:%d\n",

				__func__, hidpp_report->device_index);

		hid_err(hdev, "%s: invalid device index:%d\n", __func__,

			hidpp_report->device_index);

		return false;

	}
@@ -1500,27 +1497,25 @@ static int logi_dj_raw_event(struct hid_device *hdev, 
	switch (data[0]) {

	case REPORT_ID_DJ_SHORT:

		if (size != DJREPORT_SHORT_LENGTH) {

			dev_err(&hdev->dev, "DJ report of bad size (%d)", size);

			hid_err(hdev, "Short DJ report bad size (%d)", size);

			return false;

		}

		return logi_dj_dj_event(hdev, report, data, size);

	case REPORT_ID_DJ_LONG:

		if (size != DJREPORT_LONG_LENGTH) {

			dev_err(&hdev->dev, "DJ report of bad size (%d)", size);

			hid_err(hdev, "Long DJ report bad size (%d)", size);

			return false;

		}

		return logi_dj_dj_event(hdev, report, data, size);

	case REPORT_ID_HIDPP_SHORT:

		if (size != HIDPP_REPORT_SHORT_LENGTH) {

			dev_err(&hdev->dev,

				"Short HID++ report of bad size (%d)", size);

			hid_err(hdev, "Short HID++ report bad size (%d)", size);

			return false;

		}

		return logi_dj_hidpp_event(hdev, report, data, size);

	case REPORT_ID_HIDPP_LONG:

		if (size != HIDPP_REPORT_LONG_LENGTH) {

			dev_err(&hdev->dev,

				"Long HID++ report of bad size (%d)", size);

			hid_err(hdev, "Long HID++ report bad size (%d)", size);

			return false;

		}

		return logi_dj_hidpp_event(hdev, report, data, size);
@@ -1548,8 +1543,7 @@ static int logi_dj_probe(struct hid_device *hdev, 
	 */

	retval = hid_parse(hdev);

	if (retval) {

		dev_err(&hdev->dev,

			"%s:parse failed\n", __func__);

		hid_err(hdev, "%s: parse failed\n", __func__);

		return retval;

	}
@@ -1581,8 +1575,7 @@ static int logi_dj_probe(struct hid_device *hdev, 
	djrcv_dev = dj_get_receiver_dev(hdev, id->driver_data,

					rep->application, has_hidpp);

	if (!djrcv_dev) {

		dev_err(&hdev->dev,

			"%s:failed allocating dj_receiver_dev\n", __func__);

		hid_err(hdev, "%s: dj_get_receiver_dev failed\n", __func__);

		return -ENOMEM;

	}
@@ -1593,8 +1586,7 @@ static int logi_dj_probe(struct hid_device *hdev, 
	 * hidraw */

	retval = hid_hw_start(hdev, HID_CONNECT_HIDRAW|HID_CONNECT_HIDDEV);

	if (retval) {

		dev_err(&hdev->dev,

			"%s:hid_hw_start returned error\n", __func__);

		hid_err(hdev, "%s: hid_hw_start returned error\n", __func__);

		goto hid_hw_start_fail;

	}
@@ -1610,7 +1602,7 @@ static int logi_dj_probe(struct hid_device *hdev, 
	/* This is enabling the polling urb on the IN endpoint */

	retval = hid_hw_open(hdev);

	if (retval < 0) {

		dev_err(&hdev->dev, "%s:hid_hw_open returned error:%d\n",

		hid_err(hdev, "%s: hid_hw_open returned error:%d\n",

			__func__, retval);

		goto llopen_failed;

	}
@@ -1655,8 +1647,7 @@ static int logi_dj_reset_resume(struct hid_device *hdev) 


	retval = logi_dj_recv_switch_to_dj_mode(djrcv_dev, 0);

	if (retval < 0) {

		dev_err(&hdev->dev,

			"%s:logi_dj_recv_switch_to_dj_mode returned error:%d\n",

		hid_err(hdev, "%s: logi_dj_recv_switch_to_dj_mode returned error:%d\n",

			__func__, retval);

	}