]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
usb: common: Switch to device_property_match_property_string()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 3 Sep 2024 18:31:36 +0000 (21:31 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 11 Sep 2024 13:34:34 +0000 (15:34 +0200)
Replace open coded device_property_match_property_string().

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20240903183136.3641770-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/common/common.c

index 84ec00b7966c70146fc8bf75e1f99b04dd69d4ad..b7bea1015d7c1dfe1f98822c5236df8d80f35dd2 100644 (file)
@@ -107,19 +107,18 @@ EXPORT_SYMBOL_GPL(usb_speed_string);
  */
 enum usb_device_speed usb_get_maximum_speed(struct device *dev)
 {
-       const char *maximum_speed;
+       const char *p = "maximum-speed";
        int ret;
 
-       ret = device_property_read_string(dev, "maximum-speed", &maximum_speed);
-       if (ret < 0)
-               return USB_SPEED_UNKNOWN;
-
-       ret = match_string(ssp_rate, ARRAY_SIZE(ssp_rate), maximum_speed);
+       ret = device_property_match_property_string(dev, p, ssp_rate, ARRAY_SIZE(ssp_rate));
        if (ret > 0)
                return USB_SPEED_SUPER_PLUS;
 
-       ret = match_string(speed_names, ARRAY_SIZE(speed_names), maximum_speed);
-       return (ret < 0) ? USB_SPEED_UNKNOWN : ret;
+       ret = device_property_match_property_string(dev, p, speed_names, ARRAY_SIZE(speed_names));
+       if (ret > 0)
+               return ret;
+
+       return USB_SPEED_UNKNOWN;
 }
 EXPORT_SYMBOL_GPL(usb_get_maximum_speed);