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

Commit 713044ff authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "HID: Add return types for input_configured func ptr"

parents 916cf565 0442afb3

drivers/hid/hid-appleir.c

+3 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ out: 
	return 0;

}



static void appleir_input_configured(struct hid_device *hid,

static int appleir_input_configured(struct hid_device *hid,

		struct hid_input *hidinput)

{

	struct input_dev *input_dev = hidinput->input;
@@ -275,6 +275,8 @@ static void appleir_input_configured(struct hid_device *hid, 
	for (i = 0; i < ARRAY_SIZE(appleir_key_table); i++)

		set_bit(appleir->keymap[i], input_dev->keybit);

	clear_bit(KEY_RESERVED, input_dev->keybit);



	return 0;

}



static int appleir_input_mapping(struct hid_device *hid,

drivers/hid/hid-elo.c

+3 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static bool use_fw_quirk = true; 
module_param(use_fw_quirk, bool, S_IRUGO);

MODULE_PARM_DESC(use_fw_quirk, "Do periodic pokes for broken M firmwares (default = true)");



static void elo_input_configured(struct hid_device *hdev,

static int elo_input_configured(struct hid_device *hdev,

		struct hid_input *hidinput)

{

	struct input_dev *input = hidinput->input;
@@ -45,6 +45,8 @@ static void elo_input_configured(struct hid_device *hdev, 
	set_bit(BTN_TOUCH, input->keybit);

	set_bit(ABS_PRESSURE, input->absbit);

	input_set_abs_params(input, ABS_PRESSURE, 0, 256, 0, 0);



	return 0;

}



static void elo_process_data(struct input_dev *input, const u8 *data, int size)

drivers/hid/hid-logitech-hidpp.c

+3 −1
Original line number Diff line number Diff line
@@ -652,13 +652,15 @@ static int hidpp_input_mapping(struct hid_device *hdev, struct hid_input *hi, 
	return 0;

}



static void hidpp_input_configured(struct hid_device *hdev,

static int hidpp_input_configured(struct hid_device *hdev,

				struct hid_input *hidinput)

{

	struct hidpp_device *hidpp = hid_get_drvdata(hdev);



	if (hidpp->quirks & HIDPP_QUIRK_CLASS_WTP)

		wtp_input_configured(hdev, hidinput);



	return 0;

}



static int hidpp_raw_hidpp_event(struct hidpp_device *hidpp, u8 *data,

drivers/hid/hid-magicmouse.c

+3 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ static int magicmouse_input_mapping(struct hid_device *hdev, 
	return 0;

}



static void magicmouse_input_configured(struct hid_device *hdev,

static int magicmouse_input_configured(struct hid_device *hdev,

		struct hid_input *hi)



{
@@ -483,6 +483,8 @@ static void magicmouse_input_configured(struct hid_device *hdev, 
		/* clean msc->input to notify probe() of the failure */

		msc->input = NULL;

	}



	return ret;

}

drivers/hid/hid-ntrig.c

+4 −2
Original line number Diff line number Diff line
@@ -859,14 +859,14 @@ not_claimed_input: 
	return 1;

}



static void ntrig_input_configured(struct hid_device *hid,

static int ntrig_input_configured(struct hid_device *hid,

		struct hid_input *hidinput)



{

	struct input_dev *input = hidinput->input;



	if (hidinput->report->maxfield < 1)

		return;

		return -EINVAL;



	switch (hidinput->report->field[0]->application) {

	case HID_DG_PEN:
@@ -890,6 +890,8 @@ static void ntrig_input_configured(struct hid_device *hid, 
							"N-Trig MultiTouch";

		break;

	}



	return 0;

}



static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id)