Well ... I don't see any patch titled "HID: deletion of unused code in
hid-magicmouse" neither in my inbox nor in my linux-input@ folder. Could
you perhaps please resend?
Thanks,
Of course, I attached it. Do I need to send it in mbox format or is it ok ?
Cheers,
Benjamin
>From cfc6bae70e1531ef059d254ac4b91188bbc6c5c9 Mon Sep 17 00:00:00 2001
From: Benjamin Tissoires <tissoire@xxxxxxx>
Date: Mon, 8 Mar 2010 12:12:58 +0100
Subject: [PATCH 3/3] HID: deletion of unused code in hid-magicmouse.
This code, related to the second input device, is unnecessary as it concerns
the old implementation and is not used anymore.
Signed-off-by: Benjamin Tissoires <tissoire@xxxxxxx>
---
drivers/hid/hid-magicmouse.c | 68 ------------------------------------------
1 files changed, 0 insertions(+), 68 deletions(-)
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
index 32d90c8..b9d605e 100644
--- a/drivers/hid/hid-magicmouse.c
+++ b/drivers/hid/hid-magicmouse.c
@@ -262,74 +262,6 @@ static int magicmouse_raw_event(struct hid_device *hdev,
return 1;
}
-static int magicmouse_input_open(struct input_dev *dev)
-{
- struct hid_device *hid = input_get_drvdata(dev);
-
- return hid->ll_driver->open(hid);
-}
-
-static void magicmouse_input_close(struct input_dev *dev)
-{
- struct hid_device *hid = input_get_drvdata(dev);
-
- hid->ll_driver->close(hid);
-}
-
-static void magicmouse_setup_input(struct input_dev *input, struct hid_device *hdev)
-{
- input_set_drvdata(input, hdev);
- input->event = hdev->ll_driver->hidinput_input_event;
- input->open = magicmouse_input_open;
- input->close = magicmouse_input_close;
-
- input->name = hdev->name;
- input->phys = hdev->phys;
- input->uniq = hdev->uniq;
- input->id.bustype = hdev->bus;
- input->id.vendor = hdev->vendor;
- input->id.product = hdev->product;
- input->id.version = hdev->version;
- input->dev.parent = hdev->dev.parent;
-
- __set_bit(EV_KEY, input->evbit);
- __set_bit(BTN_LEFT, input->keybit);
- __set_bit(BTN_RIGHT, input->keybit);
- if (emulate_3button)
- __set_bit(BTN_MIDDLE, input->keybit);
- __set_bit(BTN_TOOL_FINGER, input->keybit);
-
- __set_bit(EV_REL, input->evbit);
- __set_bit(REL_X, input->relbit);
- __set_bit(REL_Y, input->relbit);
- if (emulate_scroll_wheel)
- __set_bit(REL_WHEEL, input->relbit);
-
- if (report_touches) {
- __set_bit(EV_ABS, input->evbit);
-
- input_set_abs_params(input, ABS_MT_TRACKING_ID, 0, 15, 0, 0);
- input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0, 255, 4, 0);
- input_set_abs_params(input, ABS_MT_TOUCH_MINOR, 0, 255, 4, 0);
- input_set_abs_params(input, ABS_MT_ORIENTATION, -32, 31, 1, 0);
- input_set_abs_params(input, ABS_MT_POSITION_X, -1100, 1358,
- 4, 0);
- /* Note: Touch Y position from the device is inverted relative
- * to how pointer motion is reported (and relative to how USB
- * HID recommends the coordinates work). This driver keeps
- * the origin at the same position, and just uses the additive
- * inverse of the reported Y.
- */
- input_set_abs_params(input, ABS_MT_POSITION_Y, -1589, 2047,
- 4, 0);
- }
-
- if (report_undeciphered) {
- __set_bit(EV_MSC, input->evbit);
- __set_bit(MSC_RAW, input->mscbit);
- }
-}
-
static int magicmouse_input_mapping(struct hid_device *hdev, struct hid_input *hinput,
struct hid_field *field, struct hid_usage *usage,
unsigned long **bit, int *max)
--
1.6.6.1
