Commit 3dad188e authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Jiri Kosina
Browse files

HID: wacom: switch inputs to devres 



Simplifying the error code paths.
We need to keep wacom_clean_inputs() around for now as the wireless
module is using it to dynamically remove the inputs on disconnect.

Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: default avatarPing Cheng <pingc@wacom.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent b189da90

drivers/hid/wacom_sys.c

+16 −18
Original line number Diff line number Diff line
@@ -91,6 +91,11 @@ static void wacom_close(struct input_dev *dev) 
{

	struct wacom *wacom = input_get_drvdata(dev);



	/*

	 * wacom->hdev should never be null, but surprisingly, I had the case

	 * once while unplugging the Wacom Wireless Receiver.

	 */

	if (wacom->hdev)

		hid_hw_close(wacom->hdev);

}
@@ -1370,7 +1375,7 @@ static struct input_dev *wacom_allocate_input(struct wacom *wacom) 
	struct hid_device *hdev = wacom->hdev;

	struct wacom_wac *wacom_wac = &(wacom->wacom_wac);



	input_dev = input_allocate_device();

	input_dev = devm_input_allocate_device(&hdev->dev);

	if (!input_dev)

		return NULL;
@@ -1424,10 +1429,10 @@ static int wacom_allocate_inputs(struct wacom *wacom) 
	wacom_wac->pen_input = wacom_allocate_input(wacom);

	wacom_wac->touch_input = wacom_allocate_input(wacom);

	wacom_wac->pad_input = wacom_allocate_input(wacom);

	if (!wacom_wac->pen_input || !wacom_wac->touch_input || !wacom_wac->pad_input) {

		wacom_clean_inputs(wacom);

	if (!wacom_wac->pen_input ||

	    !wacom_wac->touch_input ||

	    !wacom_wac->pad_input)

		return -ENOMEM;

	}



	wacom_wac->pen_input->name = wacom_wac->pen_name;

	wacom_wac->touch_input->name = wacom_wac->touch_name;
@@ -1458,7 +1463,7 @@ static int wacom_register_inputs(struct wacom *wacom) 
	} else {

		error = input_register_device(pen_input_dev);

		if (error)

			goto fail_register_pen_input;

			goto fail;

		wacom_wac->pen_registered = true;

	}
@@ -1471,7 +1476,7 @@ static int wacom_register_inputs(struct wacom *wacom) 
	} else {

		error = input_register_device(touch_input_dev);

		if (error)

			goto fail_register_touch_input;

			goto fail;

		wacom_wac->touch_registered = true;

	}
@@ -1484,23 +1489,19 @@ static int wacom_register_inputs(struct wacom *wacom) 
	} else {

		error = input_register_device(pad_input_dev);

		if (error)

			goto fail_register_pad_input;

			goto fail;

		wacom_wac->pad_registered = true;

	}



	return 0;



fail_register_pad_input:

	if (touch_input_dev)

		input_unregister_device(touch_input_dev);

fail:

	wacom_wac->pad_input = NULL;

	wacom_wac->pad_registered = false;

	wacom_wac->touch_input = NULL;

	wacom_wac->touch_registered = false;

fail_register_touch_input:

	if (pen_input_dev)

		input_unregister_device(pen_input_dev);

	wacom_wac->pen_input = NULL;

	wacom_wac->pen_registered = false;

fail_register_pen_input:

	return error;

}
@@ -1741,14 +1742,12 @@ fail_hw_start: 
fail_remote:

	wacom_destroy_leds(wacom);

fail_leds:

	wacom_clean_inputs(wacom);

fail_register_inputs:

fail_battery:

	wacom_remove_shared_data(wacom);

fail_shared_data:

fail_parsed:

fail_allocate_inputs:

	wacom_clean_inputs(wacom);

	return error;

}
@@ -1928,7 +1927,6 @@ static void wacom_remove(struct hid_device *hdev) 
	cancel_work_sync(&wacom->battery_work);

	kobject_put(wacom->remote_dir);

	wacom_destroy_leds(wacom);

	wacom_clean_inputs(wacom);

	if (hdev->bus == BUS_BLUETOOTH)

		device_remove_file(&hdev->dev, &dev_attr_speed);

	wacom_remove_shared_data(wacom);

CRA Git | Maintained and supported by SUSTech CRA and CCSE