Revert "drm: of: Properly try all possible cases for bridge/panel detection"

[linux-2.6-microblaze.git] / drivers / hid / hid-vivaldi.c

diff --git a/drivers/hid/hid-vivaldi.c b/drivers/hid/hid-vivaldi.c
index 42ceb20..3a97912 100644 (file)
--- a/drivers/hid/hid-vivaldi.c
+++ b/drivers/hid/hid-vivaldi.c
@@ -8,48 +8,11 @@
 
 #include <linux/device.h>
 #include <linux/hid.h>
+#include <linux/input/vivaldi-fmap.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/sysfs.h>
 
-#define MIN_FN_ROW_KEY 1
-#define MAX_FN_ROW_KEY 24
-#define HID_VD_FN_ROW_PHYSMAP 0x00000001
-#define HID_USAGE_FN_ROW_PHYSMAP (HID_UP_GOOGLEVENDOR | HID_VD_FN_ROW_PHYSMAP)
-
-struct vivaldi_data {
-       u32 function_row_physmap[MAX_FN_ROW_KEY - MIN_FN_ROW_KEY + 1];
-       int max_function_row_key;
-};
-
-static ssize_t function_row_physmap_show(struct device *dev,
-                                        struct device_attribute *attr,
-                                        char *buf)
-{
-       struct hid_device *hdev = to_hid_device(dev);
-       struct vivaldi_data *drvdata = hid_get_drvdata(hdev);
-       ssize_t size = 0;
-       int i;
-
-       if (!drvdata->max_function_row_key)
-               return 0;
-
-       for (i = 0; i < drvdata->max_function_row_key; i++)
-               size += sprintf(buf + size, "%02X ",
-                               drvdata->function_row_physmap[i]);
-       size += sprintf(buf + size, "\n");
-       return size;
-}
-
-static DEVICE_ATTR_RO(function_row_physmap);
-static struct attribute *sysfs_attrs[] = {
-       &dev_attr_function_row_physmap.attr,
-       NULL
-};
-
-static const struct attribute_group input_attribute_group = {
-       .attrs = sysfs_attrs
-};
+#include "hid-vivaldi-common.h"
 
 static int vivaldi_probe(struct hid_device *hdev,
                         const struct hid_device_id *id)
@@ -70,86 +33,8 @@ static int vivaldi_probe(struct hid_device *hdev,
        return hid_hw_start(hdev, HID_CONNECT_DEFAULT);
 }
 
-static void vivaldi_feature_mapping(struct hid_device *hdev,
-                                   struct hid_field *field,
-                                   struct hid_usage *usage)
-{
-       struct vivaldi_data *drvdata = hid_get_drvdata(hdev);
-       struct hid_report *report = field->report;
-       int fn_key;
-       int ret;
-       u32 report_len;
-       u8 *report_data, *buf;
-
-       if (field->logical != HID_USAGE_FN_ROW_PHYSMAP ||
-           (usage->hid & HID_USAGE_PAGE) != HID_UP_ORDINAL)
-               return;
-
-       fn_key = (usage->hid & HID_USAGE);
-       if (fn_key < MIN_FN_ROW_KEY || fn_key > MAX_FN_ROW_KEY)
-               return;
-       if (fn_key > drvdata->max_function_row_key)
-               drvdata->max_function_row_key = fn_key;
-
-       report_data = buf = hid_alloc_report_buf(report, GFP_KERNEL);
-       if (!report_data)
-               return;
-
-       report_len = hid_report_len(report);
-       if (!report->id) {
-               /*
-                * hid_hw_raw_request() will stuff report ID (which will be 0)
-                * into the first byte of the buffer even for unnumbered
-                * reports, so we need to account for this to avoid getting
-                * -EOVERFLOW in return.
-                * Note that hid_alloc_report_buf() adds 7 bytes to the size
-                * so we can safely say that we have space for an extra byte.
-                */
-               report_len++;
-       }
-
-       ret = hid_hw_raw_request(hdev, report->id, report_data,
-                                report_len, HID_FEATURE_REPORT,
-                                HID_REQ_GET_REPORT);
-       if (ret < 0) {
-               dev_warn(&hdev->dev, "failed to fetch feature %d\n",
-                        field->report->id);
-               goto out;
-       }
-
-       if (!report->id) {
-               /*
-                * Undo the damage from hid_hw_raw_request() for unnumbered
-                * reports.
-                */
-               report_data++;
-               report_len--;
-       }
-
-       ret = hid_report_raw_event(hdev, HID_FEATURE_REPORT, report_data,
-                                  report_len, 0);
-       if (ret) {
-               dev_warn(&hdev->dev, "failed to report feature %d\n",
-                        field->report->id);
-               goto out;
-       }
-
-       drvdata->function_row_physmap[fn_key - MIN_FN_ROW_KEY] =
-           field->value[usage->usage_index];
-
-out:
-       kfree(buf);
-}
-
-static int vivaldi_input_configured(struct hid_device *hdev,
-                                   struct hid_input *hidinput)
-{
-       return devm_device_add_group(&hdev->dev, &input_attribute_group);
-}
-
 static const struct hid_device_id vivaldi_table[] = {
-       { HID_DEVICE(HID_BUS_ANY, HID_GROUP_VIVALDI, HID_ANY_ID,
-                    HID_ANY_ID) },
+       { HID_DEVICE(HID_BUS_ANY, HID_GROUP_VIVALDI, HID_ANY_ID, HID_ANY_ID) },
        { }
 };