Commit 93c10132 authored by Jiri Slaby's avatar Jiri Slaby Committed by Jiri Kosina
Browse files

HID: move connect quirks 



Move connecting from usbhid to the hid layer and fix also hidp in
that manner.
This removes all the ignore/force hidinput/hiddev connecting quirks.

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent fea6f183

drivers/hid/hid-a4tech.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static int a4_probe(struct hid_device *hdev, const struct hid_device_id *id) 
		goto err_free;

	}



	ret = hid_hw_start(hdev);

	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);

	if (ret) {

		dev_err(&hdev->dev, "hw start failed\n");

		goto err_free;

drivers/hid/hid-apple.c

+7 −6
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ static int apple_probe(struct hid_device *hdev, 
{

	unsigned long quirks = id->driver_data;

	struct apple_sc *asc;

	unsigned int connect_mask = HID_CONNECT_DEFAULT;

	int ret;



	/* return something else or move to hid layer? device will reside
@@ -328,18 +329,18 @@ static int apple_probe(struct hid_device *hdev, 


	hid_set_drvdata(hdev, asc);



	if (quirks & APPLE_HIDDEV)

		hdev->quirks |= HID_QUIRK_HIDDEV;

	if (quirks & APPLE_IGNORE_HIDINPUT)

		hdev->quirks |= HID_QUIRK_IGNORE_HIDINPUT;



	ret = hid_parse(hdev);

	if (ret) {

		dev_err(&hdev->dev, "parse failed\n");

		goto err_free;

	}



	ret = hid_hw_start(hdev);

	if (quirks & APPLE_HIDDEV)

		connect_mask |= HID_CONNECT_HIDDEV_FORCE;

	if (quirks & APPLE_IGNORE_HIDINPUT)

		connect_mask &= ~HID_CONNECT_HIDINPUT;



	ret = hid_hw_start(hdev, connect_mask);

	if (ret) {

		dev_err(&hdev->dev, "hw start failed\n");

		goto err_free;

drivers/hid/hid-belkin.c

+2 −4
Original line number Diff line number Diff line
@@ -54,16 +54,14 @@ static int belkin_probe(struct hid_device *hdev, const struct hid_device_id *id) 


	hid_set_drvdata(hdev, (void *)quirks);



	if (quirks & BELKIN_HIDDEV)

		hdev->quirks |= HID_QUIRK_HIDDEV;



	ret = hid_parse(hdev);

	if (ret) {

		dev_err(&hdev->dev, "parse failed\n");

		goto err_free;

	}



	ret = hid_hw_start(hdev);

	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT |

		((quirks & BELKIN_HIDDEV) ? HID_CONNECT_HIDDEV_FORCE : 0));

	if (ret) {

		dev_err(&hdev->dev, "hw start failed\n");

		goto err_free;

drivers/hid/hid-core.c

+75 −1
Original line number Diff line number Diff line
@@ -1113,6 +1113,80 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i 
}

EXPORT_SYMBOL_GPL(hid_input_report);



int hid_connect(struct hid_device *hdev, unsigned int connect_mask)

{

	static const char *types[] = { "Device", "Pointer", "Mouse", "Device",

		"Joystick", "Gamepad", "Keyboard", "Keypad",

		"Multi-Axis Controller"

	};

	const char *type, *bus;

	char buf[64];

	unsigned int i;

	int len;



	if (hdev->bus != BUS_USB)

		connect_mask &= ~HID_CONNECT_HIDDEV;



	if ((connect_mask & HID_CONNECT_HIDINPUT) && !hidinput_connect(hdev,

				connect_mask & HID_CONNECT_HIDINPUT_FORCE))

		hdev->claimed |= HID_CLAIMED_INPUT;

	if ((connect_mask & HID_CONNECT_HIDDEV) && hdev->hiddev_connect &&

			!hdev->hiddev_connect(hdev,

				connect_mask & HID_CONNECT_HIDDEV_FORCE))

		hdev->claimed |= HID_CLAIMED_HIDDEV;

	if ((connect_mask & HID_CONNECT_HIDRAW) && !hidraw_connect(hdev))

		hdev->claimed |= HID_CLAIMED_HIDRAW;



	if (!hdev->claimed) {

		dev_err(&hdev->dev, "claimed by neither input, hiddev nor "

				"hidraw\n");

		return -ENODEV;

	}



	if ((hdev->claimed & HID_CLAIMED_INPUT) &&

			(connect_mask & HID_CONNECT_FF) && hdev->ff_init)

		hdev->ff_init(hdev);



	len = 0;

	if (hdev->claimed & HID_CLAIMED_INPUT)

		len += sprintf(buf + len, "input");

	if (hdev->claimed & HID_CLAIMED_HIDDEV)

		len += sprintf(buf + len, "%shiddev%d", len ? "," : "",

				hdev->minor);

	if (hdev->claimed & HID_CLAIMED_HIDRAW)

		len += sprintf(buf + len, "%shidraw%d", len ? "," : "",

				((struct hidraw *)hdev->hidraw)->minor);



	type = "Device";

	for (i = 0; i < hdev->maxcollection; i++) {

		struct hid_collection *col = &hdev->collection[i];

		if (col->type == HID_COLLECTION_APPLICATION &&

		   (col->usage & HID_USAGE_PAGE) == HID_UP_GENDESK &&

		   (col->usage & 0xffff) < ARRAY_SIZE(types)) {

			type = types[col->usage & 0xffff];

			break;

		}

	}



	switch (hdev->bus) {

	case BUS_USB:

		bus = "USB";

		break;

	case BUS_BLUETOOTH:

		bus = "BLUETOOTH";

		break;

	default:

		bus = "<UNKNOWN>";

	}



	dev_info(&hdev->dev, "%s: %s HID v%x.%02x %s [%s] on %s\n",

			buf, bus, hdev->version >> 8, hdev->version & 0xff,

			type, hdev->name, hdev->phys);



	return 0;

}

EXPORT_SYMBOL_GPL(hid_connect);



static bool hid_match_one_id(struct hid_device *hdev,

		const struct hid_device_id *id)

{
@@ -1238,7 +1312,7 @@ static int hid_device_probe(struct device *dev) 
		} else { /* default probe */

			ret = hid_parse(hdev);

			if (!ret)

				ret = hid_hw_start(hdev);

				ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);

		}

		if (ret)

			hdev->driver = NULL;

drivers/hid/hid-cypress.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static int cp_probe(struct hid_device *hdev, const struct hid_device_id *id) 
		goto err_free;

	}



	ret = hid_hw_start(hdev);

	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);

	if (ret) {

		dev_err(&hdev->dev, "hw start failed\n");

		goto err_free;