Merge branch 'for-4.19/wacom' into for-linus

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

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 52e85d2..0bdd85d 100644 (file)
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -710,18 +710,6 @@ struct wacom_hdev_data {
 static LIST_HEAD(wacom_udev_list);
 static DEFINE_MUTEX(wacom_udev_list_lock);
 
-static bool compare_device_paths(struct hid_device *hdev_a,
-               struct hid_device *hdev_b, char separator)
-{
-       int n1 = strrchr(hdev_a->phys, separator) - hdev_a->phys;
-       int n2 = strrchr(hdev_b->phys, separator) - hdev_b->phys;
-
-       if (n1 != n2 || n1 <= 0 || n2 <= 0)
-               return false;
-
-       return !strncmp(hdev_a->phys, hdev_b->phys, n1);
-}
-
 static bool wacom_are_sibling(struct hid_device *hdev,
                struct hid_device *sibling)
 {
@@ -744,10 +732,10 @@ static bool wacom_are_sibling(struct hid_device *hdev,
         * the same physical parent device path.
         */
        if (hdev->vendor == sibling->vendor && hdev->product == sibling->product) {
-               if (!compare_device_paths(hdev, sibling, '/'))
+               if (!hid_compare_device_paths(hdev, sibling, '/'))
                        return false;
        } else {
-               if (!compare_device_paths(hdev, sibling, '.'))
+               if (!hid_compare_device_paths(hdev, sibling, '.'))
                        return false;
        }
 
@@ -794,7 +782,7 @@ static struct wacom_hdev_data *wacom_get_hdev_data(struct hid_device *hdev)
 
        /* Try to find an already-probed interface from the same device */
        list_for_each_entry(data, &wacom_udev_list, list) {
-               if (compare_device_paths(hdev, data->dev, '/')) {
+               if (hid_compare_device_paths(hdev, data->dev, '/')) {
                        kref_get(&data->kref);
                        return data;
                }